- Make sure all build files and directories are properly deleted on "make clean".

svn path=/trunk/; revision=10348
This commit is contained in:
Filip Navara 2004-08-01 23:27:56 +00:00
parent 03578741a9
commit 39799e45c9
10 changed files with 28 additions and 117 deletions

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.239 2004/07/23 21:54:53 chorns Exp $
# $Id: Makefile,v 1.240 2004/08/01 23:27:54 navaraf Exp $
#
# Global makefile
#
@ -367,7 +367,7 @@ dk:
$(RMKDIR) $(SDK_PATH_INC)
$(RMKDIR) $(XDK_PATH)
$(RMKDIR) $(XDK_PATH_LIB)
$(RMKDIR) $(XDK_PATH_INC)
# $(RMKDIR) $(XDK_PATH_INC)
dk_implib:

View file

@ -22,7 +22,7 @@ all: $(PROGS)
implib:
clean:
- $(RM) lpcsrv.o lpcsrv.exe lpcsrv.sym lpcclt.o lpcclt.exe lpcsrv.sym
- $(RM) lpcsrv.o lpcsrv.exe lpcsrv.sym lpcclt.o lpcclt.exe lpcclt.sym
.phony: implib clean

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.10 2003/07/24 18:14:58 royce Exp $
# $Id: makefile,v 1.11 2004/08/01 23:27:55 navaraf Exp $
PATH_TO_TOP = ../../..
@ -10,25 +10,6 @@ TARGET_CFLAGS = -I./include -I./ospm/include
TARGET_DDKLIBS = ntoskrnl.a
OBJECTS_PATH = objects
TARGET_OBJECTS = $(OBJECTS_PATH)/$(TARGET_NAME).o
TARGET_CLEAN = \
$(OBJECTS_PATH)/*.o \
dispatcher/*.o \
events/*.o \
executer/*.o \
hardware/*.o \
namespace/*.o \
ospm/*.o \
ospm/busmgr/*.o \
parser/*.o \
resource/*.o \
tables/*.o \
utils/*.o
OBJECTS_OSPM_BUSMGR = \
ospm/busmgr/bm.o \
ospm/busmgr/bmnotify.o \
@ -159,90 +140,12 @@ OBJECTS_UTILS = \
utils/cmutils.o \
utils/cmxface.o
TARGET_OBJECTS = \
$(OBJECTS_OSPM) $(OBJECTS_DISPATCHER) $(OBJECTS_EVENTS) \
$(OBJECTS_EXECUTER) $(OBJECTS_HARDWARE) $(OBJECTS_NAMESPACE) \
$(OBJECTS_PARSER) $(OBJECTS_RESOURCE) $(OBJECTS_TABLES) \
$(OBJECTS_UTILS)
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
#
# Build intermediate objects
#
$(OBJECTS_PATH)/ospm.o: $(OBJECTS_OSPM)
$(LD) \
-r \
-o $(OBJECTS_PATH)/ospm.o \
$(OBJECTS_OSPM)
$(OBJECTS_PATH)/dispatcher.o: $(OBJECTS_DISPATCHER)
$(LD) \
-r \
-o $(OBJECTS_PATH)/dispatcher.o \
$(OBJECTS_DISPATCHER)
$(OBJECTS_PATH)/events.o: $(OBJECTS_EVENTS)
$(LD) \
-r \
-o $(OBJECTS_PATH)/events.o \
$(OBJECTS_EVENTS)
$(OBJECTS_PATH)/executer.o: $(OBJECTS_EXECUTER)
$(LD) \
-r \
-o $(OBJECTS_PATH)/executer.o \
$(OBJECTS_EXECUTER)
$(OBJECTS_PATH)/hardware.o: $(OBJECTS_HARDWARE)
$(LD) \
-r \
-o $(OBJECTS_PATH)/hardware.o \
$(OBJECTS_HARDWARE)
$(OBJECTS_PATH)/namespace.o: $(OBJECTS_NAMESPACE)
$(LD) \
-r \
-o $(OBJECTS_PATH)/namespace.o \
$(OBJECTS_NAMESPACE)
$(OBJECTS_PATH)/parser.o: $(OBJECTS_PARSER)
$(LD) \
-r \
-o $(OBJECTS_PATH)/parser.o \
$(OBJECTS_PARSER)
$(OBJECTS_PATH)/resource.o: $(OBJECTS_RESOURCE)
$(LD) \
-r \
-o $(OBJECTS_PATH)/resource.o \
$(OBJECTS_RESOURCE)
$(OBJECTS_PATH)/tables.o: $(OBJECTS_TABLES)
$(LD) \
-r \
-o $(OBJECTS_PATH)/tables.o \
$(OBJECTS_TABLES)
$(OBJECTS_PATH)/utils.o: $(OBJECTS_UTILS)
$(LD) \
-r \
-o $(OBJECTS_PATH)/utils.o \
$(OBJECTS_UTILS)
OBJECTS = \
$(OBJECTS_PATH)/ospm.o \
$(OBJECTS_PATH)/dispatcher.o \
$(OBJECTS_PATH)/events.o \
$(OBJECTS_PATH)/executer.o \
$(OBJECTS_PATH)/hardware.o \
$(OBJECTS_PATH)/namespace.o \
$(OBJECTS_PATH)/parser.o \
$(OBJECTS_PATH)/resource.o \
$(OBJECTS_PATH)/tables.o \
$(OBJECTS_PATH)/utils.o
$(OBJECTS_PATH)/$(TARGET_NAME).o: $(OBJECTS_PATH) $(OBJECTS)
$(LD) -r $(OBJECTS) -o $(OBJECTS_PATH)/$(TARGET_NAME).o
$(OBJECTS_PATH):
mkdir $(OBJECTS_PATH)

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.9 2004/02/15 21:45:28 gvg Exp $
# $Id: Makefile,v 1.10 2004/08/01 23:27:55 navaraf Exp $
PATH_TO_TOP = ../..
@ -27,6 +27,8 @@ ROS_OBJECTS = rosglue.o i386/setjmplongjmp.o
TARGET_OBJECTS = objs/*.o $(ROS_OBJECTS)
TARGET_CLEAN = objs/libfreetype.a
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.82 2004/07/08 00:40:30 weiden Exp $
# $Id: makefile,v 1.83 2004/08/01 23:27:55 navaraf Exp $
PATH_TO_TOP = ../..
@ -23,7 +23,7 @@ TARGET_GCCLIBS = gcc
TARGET_PCH = k32.h
TARGET_CLEAN = errcodes.rc msg?????.bin
TARGET_CLEAN = errcodes.rc $(PATH_TO_TOP)/include/reactos/errcodes.h msg?????.bin
SYNCH_OBJECTS = synch/critical.o synch/event.o synch/intrlck.o synch/mutex.o \
synch/sem.o synch/timer.o synch/wait.o

View file

@ -1,4 +1,4 @@
# $Id: Makefile.ros-template,v 1.4 2004/07/12 22:03:09 gvg Exp $
# $Id: Makefile.ros-template,v 1.5 2004/08/01 23:27:55 navaraf Exp $
TARGET_NAME = shell32
@ -14,6 +14,8 @@ TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
TARGET_RC_BINARIES = @RC_BINARIES@
TARGET_CLEAN = authors.c
default: all
authors.c:

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.6 2003/11/19 05:47:28 vizzini Exp $
# $Id: Makefile,v 1.7 2004/08/01 23:27:55 navaraf Exp $
PATH_TO_TOP = ../..
@ -7,7 +7,7 @@ TARGET_TYPE = library
TARGET_NAME = zlib
TARGET_CFLAGS = \
-MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-Wstrict-prototypes -Wmissing-prototypes -Werror
# require os code to explicitly request A/W version of structs/functions

View file

@ -140,7 +140,7 @@ notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h
$(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@
clean:
$(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) $(DEP_FILES)
$(TOOLS_PATH)/rdel $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) $(DEP_FILES) buildno.h notifyhook.dll
LIVECD_DIR=$(PATH_TO_TOP)/../livecd/disk

View file

@ -144,6 +144,8 @@ clean:
$(MAKE) -C wine2ros clean
$(MAKE) -C winebuild clean
$(MAKE) -C bin2res clean
$(MAKE) -C ../lib/zlib -f Makefile.host clean
@rm ../include/reactos/buildno.h
@rm mkconfig
@rm $(TOOLS)
endif
@ -158,6 +160,8 @@ clean:
$(MAKE) -C wine2ros clean
$(MAKE) -C winebuild clean
$(MAKE) -C bin2res clean
$(MAKE) -C ../lib/zlib -f Makefile.host clean
-@del ..\include\reactos\buildno.h
-@del *$(EXE_POSTFIX)
endif

View file

@ -1,4 +1,4 @@
# $Id: helper.mk,v 1.71 2004/07/23 20:03:25 chorns Exp $
# $Id: helper.mk,v 1.72 2004/08/01 23:27:56 navaraf Exp $
#
# Helper makefile for ReactOS modules
# Variables this makefile accepts:
@ -502,7 +502,7 @@ endif
ifeq ($(TARGET_RC_SRCS),)
MK_RES_SRC := $(TARGET_PATH)/$(MK_RES_BASE).rc
MK_RESOURCE := $(MK_RES_BASE).coff
MK_RESOURCE := $(TARGET_PATH)/$(MK_RES_BASE).coff
else
MK_RES_SRC := $(TARGET_RC_SRCS)
MK_RESOURCE := $(TARGET_RC_SRCS:.rc=.coff)
@ -548,7 +548,7 @@ endif
ifeq ($(TARGET_NORC),yes)
MK_FULLRES :=
else
MK_FULLRES := $(TARGET_PATH)/$(MK_RESOURCE)
MK_FULLRES := $(MK_RESOURCE)
endif
ifneq ($(TARGET_TYPE),winedll)
@ -907,7 +907,7 @@ MK_CLEANFILTERED := $(MK_OBJECTS:.o=.d)
MK_CLEANDEPS := $(join $(dir $(MK_CLEANFILTERED)), $(addprefix ., $(notdir $(MK_CLEANFILTERED))))
clean: $(MK_REGTESTS_CLEAN) $(SUBDIRS:%=%_clean)
- $(RM) *.o depend.d *.pch $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \
- $(RM) *.o depend.d *.pch *.gch $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \
$(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) $(MK_BASENAME).map \
junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) $(MK_GENERATED_MAKEFILE) \
$(TARGET_CLEAN)