From 1f7f2ec88f0beea2994876cd54c450c7023d9b07 Mon Sep 17 00:00:00 2001 From: Rex Jolliff Date: Sun, 15 Jul 2001 21:19:02 +0000 Subject: [PATCH] move work on clean rule svn path=/trunk/; revision=2064 --- reactos/Makefile | 5 +- reactos/apps/tests/alive/Makefile | 4 +- reactos/apps/tests/apc/makefile | 4 +- reactos/apps/tests/args/makefile | 4 +- reactos/apps/tests/atomtest/makefile | 8 +- reactos/apps/tests/bench/makefile | 8 +- reactos/apps/tests/consume/Makefile | 8 +- reactos/apps/tests/count/Makefile | 4 +- reactos/apps/tests/dump_shared_data/makefile | 8 +- reactos/apps/tests/event/makefile | 8 +- reactos/apps/tests/file/Makefile | 4 +- reactos/apps/tests/gditest/makefile | 8 +- reactos/apps/tests/hello/makefile | 8 +- reactos/apps/tests/lpc/makefile | 7 +- reactos/apps/tests/mstest/Makefile | 4 +- reactos/apps/tests/nptest/Makefile | 4 +- reactos/apps/tests/pteb/Makefile | 8 +- reactos/apps/tests/regtest/makefile | 4 +- reactos/apps/tests/shm/makefile | 4 +- reactos/apps/tests/test_old/makefile | 8 +- reactos/apps/tests/thread/makefile | 8 +- reactos/apps/tests/vmtest/Makefile | 8 +- reactos/apps/utils/buildno/Makefile | 6 +- reactos/apps/utils/cabman/makefile | 12 +-- reactos/apps/utils/cat/makefile | 4 +- reactos/apps/utils/net/ping/makefile | 8 +- reactos/apps/utils/net/roshttpd/makefile | 12 +-- reactos/apps/utils/net/telnet/Makefile | 14 +-- reactos/apps/utils/objdir/makefile | 4 +- reactos/drivers/bus/acpi/makefile | 18 +--- reactos/drivers/bus/isapnp/makefile | 15 +--- reactos/drivers/dd/beep/makefile | 10 +-- reactos/drivers/dd/blue/makefile | 10 +-- reactos/drivers/dd/floppy/Makefile | 12 +-- reactos/drivers/dd/ide/makefile | 10 +-- reactos/drivers/dd/mouse/makefile | 6 +- reactos/drivers/dd/null/makefile | 9 +- reactos/drivers/dd/parallel/makefile | 9 +- reactos/drivers/dd/ramdrv/makefile | 9 +- reactos/drivers/dd/sdisk/makefile | 6 +- reactos/drivers/dd/serial/makefile | 9 +- reactos/drivers/dd/sound/makefile | 8 -- reactos/drivers/dd/test/makefile | 7 +- reactos/drivers/dd/vga/display/makefile | 14 +-- reactos/drivers/dd/vga/miniport/makefile | 9 +- reactos/drivers/dd/vidport/makefile | 10 +-- reactos/drivers/fs/ext2/makefile | 9 +- reactos/drivers/fs/minix/Makefile | 11 +-- reactos/drivers/fs/ms/Makefile | 6 +- reactos/drivers/fs/np/Makefile | 9 +- reactos/drivers/fs/template/makefile | 3 +- reactos/drivers/fs/vfat/makefile | 13 +-- reactos/drivers/input/keyboard/makefile | 10 +-- reactos/drivers/input/mouclass/makefile | 9 +- reactos/drivers/input/psaux/makefile | 9 +- reactos/drivers/input/sermouse/makefile | 9 +- reactos/drivers/net/afd/makefile | 13 +-- reactos/drivers/net/dd/ne2000/Makefile | 16 +--- reactos/drivers/net/ndis/Makefile | 13 +-- reactos/drivers/net/tcpip/makefile | 17 +--- reactos/drivers/net/tdi/Makefile | 18 +--- reactos/drivers/net/tditest/makefile | 13 +-- reactos/drivers/net/wshtcpip/makefile | 13 +-- reactos/iface/addsys/makefile | 15 +--- reactos/iface/native/makefile | 13 +-- reactos/lib/advapi32/makefile | 17 +--- reactos/lib/crtdll/makefile | 18 +--- reactos/lib/fmifs/makefile | 10 +-- reactos/lib/gdi32/makefile | 14 +-- reactos/lib/kernel32/makefile | 17 +--- reactos/lib/msafd/makefile | 14 +-- reactos/lib/msvcrt/Makefile | 67 ++------------- reactos/lib/ntdll/makefile | 17 +--- reactos/lib/ole32/makefile | 15 +--- reactos/lib/rpcrt4/Makefile | 17 +--- reactos/lib/secur32/Makefile | 10 +-- reactos/lib/shell32/makefile | 17 +--- reactos/lib/user32/makefile_rex | 15 +--- reactos/lib/version/makefile | 14 +-- reactos/lib/ws2_32/makefile | 14 +-- reactos/ntoskrnl/Makefile | 20 +---- reactos/rdel.c | 89 ++++++++++++++++++++ reactos/rules.mak | 2 +- reactos/services/lsass/makefile | 7 +- reactos/subsys/csrss/makefile | 16 +--- reactos/subsys/smss/makefile | 11 +-- reactos/subsys/system/services/makefile | 10 +-- reactos/subsys/system/shell/makefile | 10 +-- reactos/subsys/system/winlogon/makefile | 7 +- reactos/subsys/win32k/makefile | 17 +--- 90 files changed, 318 insertions(+), 733 deletions(-) create mode 100644 reactos/rdel.c diff --git a/reactos/Makefile b/reactos/Makefile index 60dbf5e6cbf..e6df8b2636d 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -71,7 +71,8 @@ all: buildno $(COMPONENTS) $(BUS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES .PHONY: all -clean: buildno_clean $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_clean) \ +clean: rdel$(EXE_POSTFIX) buildno_clean $(COMPONENTS:%=%_clean) \ + $(BUS:%=%_clean) $(DLLS:%=%_clean) \ $(LOADERS:%=%_clean) $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) \ $(SYS_APPS:%=%_clean) $(APPS:%=%_clean) $(NET_APPS:%=%_clean) @@ -95,6 +96,8 @@ rmkdir$(EXE_POSTFIX): rmkdir.c $(HOST_CC) -g -DDOS_PATHS rmkdir.c -o rmkdir$(EXE_POSTFIX) endif +rdel$(EXE_POSTFIX): rdel.c + $(HOST_CC) -g rdel.c -liberty -o rdel$(EXE_POSTFIX) install: rcopy$(EXE_POSTFIX) rmkdir$(EXE_POSTFIX) make_install_dirs autoexec_install \ $(COMPONENTS:%=%_install) $(BUS:%=%_install) \ diff --git a/reactos/apps/tests/alive/Makefile b/reactos/apps/tests/alive/Makefile index 959073dad64..4562d2b4061 100644 --- a/reactos/apps/tests/alive/Makefile +++ b/reactos/apps/tests/alive/Makefile @@ -23,9 +23,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) $(TARGET_NAME).o - - $(RM) $(TARGET_NAME).exe - - $(RM) $(TARGET_NAME).sym + - $(RM) $(TARGET_NAME).o $(TARGET_NAME).exe $(TARGET_NAME).sym .phony: clean diff --git a/reactos/apps/tests/apc/makefile b/reactos/apps/tests/apc/makefile index 9a9e65431c5..82e6f21b7cc 100644 --- a/reactos/apps/tests/apc/makefile +++ b/reactos/apps/tests/apc/makefile @@ -17,9 +17,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) apc.o - - $(RM) apc.exe - - $(RM) apc.sym + - $(RM) apc.o apc.exe apc.sym .phony: clean diff --git a/reactos/apps/tests/args/makefile b/reactos/apps/tests/args/makefile index 861a36a4e50..e8aeeda4a38 100644 --- a/reactos/apps/tests/args/makefile +++ b/reactos/apps/tests/args/makefile @@ -13,9 +13,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) args.o - - $(RM) args.exe - - $(RM) args.sym + - $(RM) args.o args.exe args.sym .phony: clean diff --git a/reactos/apps/tests/atomtest/makefile b/reactos/apps/tests/atomtest/makefile index 2acc5833918..5968d451a3b 100644 --- a/reactos/apps/tests/atomtest/makefile +++ b/reactos/apps/tests/atomtest/makefile @@ -12,12 +12,10 @@ CLEAN_FILES = atomtest.o atomtest.exe all: atomtest.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/tests/bench/makefile b/reactos/apps/tests/bench/makefile index 2c94095a1ef..dc72e682919 100644 --- a/reactos/apps/tests/bench/makefile +++ b/reactos/apps/tests/bench/makefile @@ -9,12 +9,8 @@ all: $(PROGS:%=%.exe) .phony: all -clean: $(PROGS:%=%_clean) - -$(PROGS:%=%_clean): %_clean: - - $(RM) $*.o - - $(RM) $*.exe - - $(RM) $*.sym +clean: + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/consume/Makefile b/reactos/apps/tests/consume/Makefile index 7bd18dd8aad..f04a5baa616 100644 --- a/reactos/apps/tests/consume/Makefile +++ b/reactos/apps/tests/consume/Makefile @@ -10,12 +10,10 @@ CLEAN_FILES = consume.o consume.exe all: consume.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/tests/count/Makefile b/reactos/apps/tests/count/Makefile index f5f6692bc28..3acc37cca00 100644 --- a/reactos/apps/tests/count/Makefile +++ b/reactos/apps/tests/count/Makefile @@ -23,9 +23,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) $(TARGET_NAME).o - - $(RM) $(TARGET_NAME).exe - - $(RM) $(TARGET_NAME).sym + - $(RM) $(TARGET_NAME).o $(TARGET_NAME).exe $(TARGET_NAME).sym .phony: clean diff --git a/reactos/apps/tests/dump_shared_data/makefile b/reactos/apps/tests/dump_shared_data/makefile index 16075283a0f..a4532cd8d0c 100644 --- a/reactos/apps/tests/dump_shared_data/makefile +++ b/reactos/apps/tests/dump_shared_data/makefile @@ -10,12 +10,10 @@ CLEAN_FILES = dump_shared_data.o dump_shared_data.exe all: dump_shared_data.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/tests/event/makefile b/reactos/apps/tests/event/makefile index 50815bb985e..8606774ab99 100644 --- a/reactos/apps/tests/event/makefile +++ b/reactos/apps/tests/event/makefile @@ -9,12 +9,8 @@ all: $(PROGS:%=%.exe) .phony: all -clean: $(PROGS:%=%_clean) - -$(PROGS:%=%_clean): %_clean: - - $(RM) $*.o - - $(RM) $*.exe - - $(RM) $*.sym +clean: + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/file/Makefile b/reactos/apps/tests/file/Makefile index a95e3d71789..d39f4ca504a 100644 --- a/reactos/apps/tests/file/Makefile +++ b/reactos/apps/tests/file/Makefile @@ -13,9 +13,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) file.o - - $(RM) file.exe - - $(RM) file.sym + - $(RM) file.o file.exe file.sym .phony: clean diff --git a/reactos/apps/tests/gditest/makefile b/reactos/apps/tests/gditest/makefile index c8b107a9e97..8f9b06450c4 100644 --- a/reactos/apps/tests/gditest/makefile +++ b/reactos/apps/tests/gditest/makefile @@ -13,12 +13,8 @@ all: $(PROGS:%=%.exe) .phony: all -$(PROGS:%=%_clean): %_clean: - - $(RM) $*.o - - $(RM) $*.exe - - $(RM) $*.sym - -clean: $(PROGS:%=%_clean) +clean: + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/hello/makefile b/reactos/apps/tests/hello/makefile index 13e76ab9f58..561900f103e 100644 --- a/reactos/apps/tests/hello/makefile +++ b/reactos/apps/tests/hello/makefile @@ -10,12 +10,10 @@ CLEAN_FILES = hello.o hello.exe all: hello.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/tests/lpc/makefile b/reactos/apps/tests/lpc/makefile index 433e1d0109d..0d7f6309dee 100644 --- a/reactos/apps/tests/lpc/makefile +++ b/reactos/apps/tests/lpc/makefile @@ -17,12 +17,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) lpcsrv.o - - $(RM) lpcsrv.exe - - $(RM) lpcsrv.sym - - $(RM) lpcclt.o - - $(RM) lpcclt.exe - - $(RM) lpcsrv.sym + - $(RM) lpcsrv.o lpcsrv.exe lpcsrv.sym lpcclt.o lpcclt.exe lpcsrv.sym .phony: clean diff --git a/reactos/apps/tests/mstest/Makefile b/reactos/apps/tests/mstest/Makefile index 45061969e94..3e3d19e28d0 100644 --- a/reactos/apps/tests/mstest/Makefile +++ b/reactos/apps/tests/mstest/Makefile @@ -16,9 +16,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) *.o - - $(RM) *.exe - - $(RM) *.sym + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/nptest/Makefile b/reactos/apps/tests/nptest/Makefile index c51f7f66919..bc94bc8122d 100644 --- a/reactos/apps/tests/nptest/Makefile +++ b/reactos/apps/tests/nptest/Makefile @@ -16,9 +16,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) *.o - - $(RM) *.exe - - $(RM) *.sym + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/pteb/Makefile b/reactos/apps/tests/pteb/Makefile index ba20e8d1ec9..5d7c2c41520 100644 --- a/reactos/apps/tests/pteb/Makefile +++ b/reactos/apps/tests/pteb/Makefile @@ -10,12 +10,10 @@ CLEAN_FILES = pteb.o pteb.exe all: pteb.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/tests/regtest/makefile b/reactos/apps/tests/regtest/makefile index fef288d4abd..71409325ade 100644 --- a/reactos/apps/tests/regtest/makefile +++ b/reactos/apps/tests/regtest/makefile @@ -15,9 +15,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) *.o - - $(RM) *.exe - - $(RM) *.sym + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/shm/makefile b/reactos/apps/tests/shm/makefile index 00eb6b1ec81..e8abb301c28 100644 --- a/reactos/apps/tests/shm/makefile +++ b/reactos/apps/tests/shm/makefile @@ -17,9 +17,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) *.o - - $(RM) *.exe - - $(RM) *.sym + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/test_old/makefile b/reactos/apps/tests/test_old/makefile index 0e650cab477..cb8c8929c08 100644 --- a/reactos/apps/tests/test_old/makefile +++ b/reactos/apps/tests/test_old/makefile @@ -10,12 +10,8 @@ all: $(PROGS:%=%.exe) .phony: all -$(PROGS:%=%_clean): %_clean: - - $(RM) $*.o - - $(RM) $*.exe - - $(RM) $*.sym - -clean: $(PROGS:%=%_clean) +clean: + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/thread/makefile b/reactos/apps/tests/thread/makefile index d5cbd28df63..05b001c346b 100644 --- a/reactos/apps/tests/thread/makefile +++ b/reactos/apps/tests/thread/makefile @@ -9,12 +9,8 @@ all: $(PROGS:%=%.exe) .phony: all -clean: $(PROGS:%=%_clean) - -$(PROGS:%=%_clean): %_clean: - - $(RM) $*.o - - $(RM) $*.exe - - $(RM) $*.sym +clean: + - $(RM) *.o *.exe *.sym .phony: clean diff --git a/reactos/apps/tests/vmtest/Makefile b/reactos/apps/tests/vmtest/Makefile index 5e8a1af6c61..6b4a1ed03a6 100644 --- a/reactos/apps/tests/vmtest/Makefile +++ b/reactos/apps/tests/vmtest/Makefile @@ -10,12 +10,10 @@ CLEAN_FILES = vmtest.o vmtest.exe all: vmtest.exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/utils/buildno/Makefile b/reactos/apps/utils/buildno/Makefile index eb6f508631e..3113d3e03f2 100644 --- a/reactos/apps/utils/buildno/Makefile +++ b/reactos/apps/utils/buildno/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 2001/04/11 22:13:21 dwelch Exp $ +# $Id: Makefile,v 1.10 2001/07/15 21:18:49 rex Exp $ # PATH_TO_TOP = ../.. @@ -17,9 +17,7 @@ $(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).c ../../include/reactos/version.h clean: - - $(RM) $(TARGETNAME).o - - $(RM) $(TARGETNAME).sym - - $(RM) $(TARGETNAME)$(EXE_POSTFIX) + - $(RM) $(CLEAN_FILES) .phony: clean diff --git a/reactos/apps/utils/cabman/makefile b/reactos/apps/utils/cabman/makefile index 5f96c45c199..dd40a7aa733 100644 --- a/reactos/apps/utils/cabman/makefile +++ b/reactos/apps/utils/cabman/makefile @@ -14,21 +14,15 @@ PROGS = $(TARGET).exe test.exe CFLAGS += -O3 -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.o zlib\*.o $(TARGET).exe $(TARGET).sym test.exe test.sym -else CLEAN_FILES = *.o zlib/*.o $(TARGET).exe $(TARGET).sym test.exe test.sym -endif all: $(PROGS) -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/utils/cat/makefile b/reactos/apps/utils/cat/makefile index 371b671e6d8..779006b4a74 100644 --- a/reactos/apps/utils/cat/makefile +++ b/reactos/apps/utils/cat/makefile @@ -11,9 +11,7 @@ all: cat.exe .phony: all clean: - - $(RM) cat.o - - $(RM) cat.exe - - $(RM) cat.sym + - $(RM) cat.o cat.exe cat.sym .phony: clean diff --git a/reactos/apps/utils/net/ping/makefile b/reactos/apps/utils/net/ping/makefile index 7b21cc92b9b..1043f591a08 100644 --- a/reactos/apps/utils/net/ping/makefile +++ b/reactos/apps/utils/net/ping/makefile @@ -15,12 +15,10 @@ CLEAN_FILES = $(TARGETNAME).o $(TARGETNAME).exe $(TARGETNAME).sym all: $(TARGETNAME).exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/utils/net/roshttpd/makefile b/reactos/apps/utils/net/roshttpd/makefile index f30670971b8..f1d56ed202b 100644 --- a/reactos/apps/utils/net/roshttpd/makefile +++ b/reactos/apps/utils/net/roshttpd/makefile @@ -16,20 +16,14 @@ LIBS = ../../../lib/kernel32/kernel32.a \ ../../../lib/ws2_32/ws2_32.a \ ../../../lib/user32/user32.a -ifeq ($(DOSCLI), yes) -CLEAN_FILES = *.o $(TARGETNAME).exe $(TARGETNAME).sym common\*.o -else CLEAN_FILES = *.o $(TARGETNAME).exe $(TARGETNAME).sym common/*.o -endif all: $(TARGETNAME).exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/utils/net/telnet/Makefile b/reactos/apps/utils/net/telnet/Makefile index 95df02cf62a..f18b72ec259 100644 --- a/reactos/apps/utils/net/telnet/Makefile +++ b/reactos/apps/utils/net/telnet/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2001/01/27 22:38:43 ea Exp $ +# $Id: Makefile,v 1.2 2001/07/15 21:18:52 rex Exp $ # # ReactOS Network Virtual Terminal (telnet) console client # @@ -24,20 +24,14 @@ LIBRARIES=\ PROGS=$(TARGET_NAME).exe -ifeq ($(DOSCLI), yes) CLEAN_FILES = *.o $(TARGET_NAME).exe $(TARGET_NAME).sym -else -CLEAN_FILES = *.o $(TARGET_NAME).exe $(TARGET_NAME).sym -endif all: $(TARGET_NAME).exe -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/apps/utils/objdir/makefile b/reactos/apps/utils/objdir/makefile index 82052a19861..8041a677383 100644 --- a/reactos/apps/utils/objdir/makefile +++ b/reactos/apps/utils/objdir/makefile @@ -21,9 +21,7 @@ all: $(PROGS) .phony: all clean: - - $(RM) $(TARGET_NAME).o - - $(RM) $(TARGET_NAME).exe - - $(RM) $(TARGET_NAME).sym + - $(RM) $(TARGET_NAME).o $(TARGET_NAME).exe $(TARGET_NAME).sym .phony: clean diff --git a/reactos/drivers/bus/acpi/makefile b/reactos/drivers/bus/acpi/makefile index 4caaf6e687d..94f74645010 100644 --- a/reactos/drivers/bus/acpi/makefile +++ b/reactos/drivers/bus/acpi/makefile @@ -263,28 +263,16 @@ $(TARGET).sys: $(OBJECTS_PATH) $(OBJECTS) $(LIBS) # $(STRIP) --strip-debug $(TARGET).sys -ifeq ($(DOSCLI),yes) -CLEAN_FILES = $(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 \ - $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ - $(TARGET).sys $(TARGET).sym $(TARGET).coff -else CLEAN_FILES = $(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 \ $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ $(TARGET).sys $(TARGET).sym $(TARGET).coff -endif +clean: + - $(RM) $(CLEAN_FILES) -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) - +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGET).sys diff --git a/reactos/drivers/bus/isapnp/makefile b/reactos/drivers/bus/isapnp/makefile index 37927b4c91d..17f48251a20 100644 --- a/reactos/drivers/bus/isapnp/makefile +++ b/reactos/drivers/bus/isapnp/makefile @@ -22,22 +22,13 @@ $(TARGET).coff: $(TARGET).rc $(PATH_TO_TOP)/include/reactos/resource.h $(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS) -ifeq ($(DOSCLI),yes) CLEAN_FILES = *.o $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ $(TARGET).exe $(TARGET).nostrip.exe $(TARGET).sym $(TARGET).coff -else -CLEAN_FILES = *.o $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ - $(TARGET).exe $(TARGET).nostrip.exe $(TARGET).sym $(TARGET).coff -endif +clean: + - $(RM) $(CLEAN_FILES) -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) - +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGET).sys diff --git a/reactos/drivers/dd/beep/makefile b/reactos/drivers/dd/beep/makefile index 16f4d94c939..5ff44fe3b89 100644 --- a/reactos/drivers/dd/beep/makefile +++ b/reactos/drivers/dd/beep/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.10 2001/06/22 12:23:49 ekohl Exp $ +# $Id: makefile,v 1.11 2001/07/15 21:18:57 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,13 +14,7 @@ all: $(TARGET).sys $(TARGET).sys.unstripped .PHONY: all clean: - - $(RM) beep.o - - $(RM) beep.coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) beep.o beep.coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/dd/blue/makefile b/reactos/drivers/dd/blue/makefile index c3c044dd62e..833a9a4cf0a 100644 --- a/reactos/drivers/dd/blue/makefile +++ b/reactos/drivers/dd/blue/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.16 2001/06/22 12:23:56 ekohl Exp $ +# $Id: makefile,v 1.17 2001/07/15 21:18:57 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,13 +14,7 @@ all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) blue.sys - - $(RM) blue.sys.unstripped + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp blue.sys blue.sys.unstripped .phony: clean diff --git a/reactos/drivers/dd/floppy/Makefile b/reactos/drivers/dd/floppy/Makefile index de15364a27e..78b549a64c0 100644 --- a/reactos/drivers/dd/floppy/Makefile +++ b/reactos/drivers/dd/floppy/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 2001/06/22 12:24:04 ekohl Exp $ +# $Id: Makefile,v 1.8 2001/07/15 21:18:57 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -20,15 +20,7 @@ dpc.o: floppy.h .phony: all clean: - - $(RM) floppy.o - - $(RM) isr.o - - $(RM) dpc.o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) floppy.o isr.o dpc.o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/dd/ide/makefile b/reactos/drivers/dd/ide/makefile index 895a2781246..06803f5d393 100644 --- a/reactos/drivers/dd/ide/makefile +++ b/reactos/drivers/dd/ide/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.22 2001/06/22 12:24:53 ekohl Exp $ +# $Id: makefile,v 1.23 2001/07/15 21:18:57 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,13 +14,7 @@ all: $(TARGET).sys.unstripped $(TARGET).sys .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/dd/mouse/makefile b/reactos/drivers/dd/mouse/makefile index acb5ee507e0..6300fdfd361 100644 --- a/reactos/drivers/dd/mouse/makefile +++ b/reactos/drivers/dd/mouse/makefile @@ -11,11 +11,7 @@ all: mouse.o .phony: all clean: - - $(RM) mouse.o - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) mouse.sys + - $(RM) mouse.o junk.tmp base.tmp temp.exp mouse.sys .phony: clean diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile index f2b6f5cd4dd..94f2ff9f423 100644 --- a/reactos/drivers/dd/null/makefile +++ b/reactos/drivers/dd/null/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.11 2001/06/22 12:25:04 ekohl Exp $ +# $Id: makefile,v 1.12 2001/07/15 21:18:58 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -13,12 +13,7 @@ all: $(TARGETNAME).sys .phony: all clean: - - $(RM) $(TARGETNAME).o - - $(RM) $(TARGETNAME).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGETNAME).sys + - $(RM) $(TARGETNAME).o $(TARGETNAME).coff junk.tmp base.tmp temp.exp $(TARGETNAME).sys .phony: clean diff --git a/reactos/drivers/dd/parallel/makefile b/reactos/drivers/dd/parallel/makefile index f761329f764..8e51eb24d69 100644 --- a/reactos/drivers/dd/parallel/makefile +++ b/reactos/drivers/dd/parallel/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2001/06/22 12:25:14 ekohl Exp $ +# $Id: makefile,v 1.13 2001/07/15 21:18:58 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -13,12 +13,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys .phony: clean diff --git a/reactos/drivers/dd/ramdrv/makefile b/reactos/drivers/dd/ramdrv/makefile index 7b6c28c9752..3a9e0744458 100644 --- a/reactos/drivers/dd/ramdrv/makefile +++ b/reactos/drivers/dd/ramdrv/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 2001/06/22 12:25:24 ekohl Exp $ +# $Id: makefile,v 1.3 2001/07/15 21:18:58 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -16,12 +16,7 @@ ramdrv.o: ramdrv.h .phony: all clean: - - $(RM) floppy.o - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) floppy.o junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/dd/sdisk/makefile b/reactos/drivers/dd/sdisk/makefile index 6c881dcd345..c60a9638bbe 100644 --- a/reactos/drivers/dd/sdisk/makefile +++ b/reactos/drivers/dd/sdisk/makefile @@ -10,11 +10,7 @@ all: sdisk.sys .phony: all clean: - - $(RM) sdisk.o - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) sdisk.sys + - $(RM) sdisk.o junk.tmp base.tmp temp.exp sdisk.sys .phony: clean diff --git a/reactos/drivers/dd/serial/makefile b/reactos/drivers/dd/serial/makefile index 93840a19aab..0169753b4d4 100644 --- a/reactos/drivers/dd/serial/makefile +++ b/reactos/drivers/dd/serial/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2001/06/22 12:25:35 ekohl Exp $ +# $Id: makefile,v 1.13 2001/07/15 21:18:58 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -13,12 +13,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys .phony: clean diff --git a/reactos/drivers/dd/sound/makefile b/reactos/drivers/dd/sound/makefile index d176a2fbc8c..c75fa42e3af 100644 --- a/reactos/drivers/dd/sound/makefile +++ b/reactos/drivers/dd/sound/makefile @@ -10,15 +10,7 @@ all: sound.sys .phony: all clean: -ifeq ($(DOSCLI),yes) - - $(RM) sound.o - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) sound.sys -else - $(RM) sound.o junk.tmp base.tmp temp.exp sound.sys -endif .phony: clean diff --git a/reactos/drivers/dd/test/makefile b/reactos/drivers/dd/test/makefile index d7098609927..37bfdc8104e 100644 --- a/reactos/drivers/dd/test/makefile +++ b/reactos/drivers/dd/test/makefile @@ -10,12 +10,7 @@ all: test.sys .phony: all clean: - - $(RM) test.o - - $(RM) test.a - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) test.sys + - $(RM) test.o test.a junk.tmp base.tmp temp.exp test.sys .phony: clean diff --git a/reactos/drivers/dd/vga/display/makefile b/reactos/drivers/dd/vga/display/makefile index 847e7c08c90..b0bbcd2d080 100644 --- a/reactos/drivers/dd/vga/display/makefile +++ b/reactos/drivers/dd/vga/display/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.15 2001/06/22 12:26:01 ekohl Exp $ +# $Id: makefile,v 1.16 2001/07/15 21:18:59 rex Exp $ # # Makefile for ReactOS vgaddi.dll # @@ -67,18 +67,12 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.o *.coff *.sym *.tmp *.dll main\*.o objects\*.o vgavideo\*.o *.a -else CLEAN_FILES = *.o *.coff *.sym *.tmp *.dll main/*.o objects/*.o vgavideo/*.o *.a -endif -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/drivers/dd/vga/miniport/makefile b/reactos/drivers/dd/vga/miniport/makefile index 22c52ba5ad6..7b1a068a2f0 100644 --- a/reactos/drivers/dd/vga/miniport/makefile +++ b/reactos/drivers/dd/vga/miniport/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.6 2001/06/22 12:26:09 ekohl Exp $ +# $Id: makefile,v 1.7 2001/07/15 21:18:59 rex Exp $ # # PATH_TO_TOP = ../../../.. @@ -11,12 +11,7 @@ all: vgamp.sys .phony: all clean: - - $(RM) *.o - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) *.sys - - $(RM) *.coff + - $(RM) *.o junk.tmp base.tmp temp.exp *.sys *.coff .phony: clean diff --git a/reactos/drivers/dd/vidport/makefile b/reactos/drivers/dd/vidport/makefile index 17f6acf3f71..b86a322e4c2 100644 --- a/reactos/drivers/dd/vidport/makefile +++ b/reactos/drivers/dd/vidport/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.11 2001/06/22 12:26:18 ekohl Exp $ +# $Id: makefile,v 1.12 2001/07/15 21:18:59 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,13 +14,7 @@ all: $(TARGET).sys vidport.a .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).a - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys + - $(RM) $(TARGET).o $(TARGET).a $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys .phony: clean diff --git a/reactos/drivers/fs/ext2/makefile b/reactos/drivers/fs/ext2/makefile index d69839c6cfa..46bcdbda496 100644 --- a/reactos/drivers/fs/ext2/makefile +++ b/reactos/drivers/fs/ext2/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.11 2001/06/22 12:26:30 ekohl Exp $ +# $Id: makefile,v 1.12 2001/07/15 21:18:59 rex Exp $ # # Linux Ext2 IFS Driver # @@ -18,12 +18,7 @@ all: $(TARGETNAME).sys .phony: all clean: - - $(RM) *.o - - $(RM) ext2.coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGETNAME).sys + - $(RM) *.o ext2.coff junk.tmp base.tmp temp.exp $(TARGETNAME).sys .phony: clean diff --git a/reactos/drivers/fs/minix/Makefile b/reactos/drivers/fs/minix/Makefile index 4fe6aaa0147..e232a78d0b5 100644 --- a/reactos/drivers/fs/minix/Makefile +++ b/reactos/drivers/fs/minix/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 2001/06/22 12:26:38 ekohl Exp $ +# $Id: Makefile,v 1.6 2001/07/15 21:18:59 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,14 +14,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) *.o - - $(RM) *.coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) *.sym - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) *.o *.coff junk.tmp base.tmp temp.exp *.sym $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/fs/ms/Makefile b/reactos/drivers/fs/ms/Makefile index 01025ce3269..796c144996f 100644 --- a/reactos/drivers/fs/ms/Makefile +++ b/reactos/drivers/fs/ms/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 2001/06/22 12:26:46 ekohl Exp $ +# $Id: Makefile,v 1.4 2001/07/15 21:18:59 rex Exp $ # # Mailslot File System # @@ -17,9 +17,7 @@ all: $(TARGETNAME).sys .phony: all clean: - - $(RM) *.o - - $(RM) $(TARGETNAME).sym - - $(RM) $(TARGETNAME).sys + - $(RM) *.o $(TARGETNAME).sym $(TARGETNAME).sys .phony: clean diff --git a/reactos/drivers/fs/np/Makefile b/reactos/drivers/fs/np/Makefile index 88586b8c390..02046aba6d4 100644 --- a/reactos/drivers/fs/np/Makefile +++ b/reactos/drivers/fs/np/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 2001/06/22 12:27:02 ekohl Exp $ +# $Id: Makefile,v 1.9 2001/07/15 21:18:59 rex Exp $ # # Named Pipes File System # @@ -17,12 +17,7 @@ all: $(TARGETNAME).sys .phony: all clean: - - $(RM) *.o - - $(RM) npfs.coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGETNAME).sys + - $(RM) *.o npfs.coff junk.tmp base.tmp temp.exp $(TARGETNAME).sys .phony: clean diff --git a/reactos/drivers/fs/template/makefile b/reactos/drivers/fs/template/makefile index 4f196e9bdae..21493173701 100644 --- a/reactos/drivers/fs/template/makefile +++ b/reactos/drivers/fs/template/makefile @@ -10,8 +10,7 @@ all: tfsd.o .phony: all clean: - - $(RM) template.o - - $(RM) tfsd.o + - $(RM) template.o tfsd.o .phony: clean diff --git a/reactos/drivers/fs/vfat/makefile b/reactos/drivers/fs/vfat/makefile index 870527378b7..1ee6da7b45d 100644 --- a/reactos/drivers/fs/vfat/makefile +++ b/reactos/drivers/fs/vfat/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.32 2001/07/05 01:51:52 rex Exp $ +# $Id: makefile,v 1.33 2001/07/15 21:19:00 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -18,18 +18,7 @@ all: $(TARGET).sys.unstripped $(TARGET).sys .phony: all clean: -ifeq ($(DOSCLI),yes) - - $(RM) *.o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped -else - $(RM) *.o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped -endif .phony: clean diff --git a/reactos/drivers/input/keyboard/makefile b/reactos/drivers/input/keyboard/makefile index f14051a3dc5..6fc5da55745 100644 --- a/reactos/drivers/input/keyboard/makefile +++ b/reactos/drivers/input/keyboard/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.4 2001/06/22 12:28:00 ekohl Exp $ +# $Id: makefile,v 1.5 2001/07/15 21:19:00 rex Exp $ # # PATH_TO_TOP = ../../.. @@ -14,13 +14,7 @@ all: $(TARGET).sys $(TARGET).sys.unstripped .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) $(TARGET).sys - - $(RM) $(TARGET).sys.unstripped + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sys.unstripped .phony: clean diff --git a/reactos/drivers/input/mouclass/makefile b/reactos/drivers/input/mouclass/makefile index af64776d8c3..56c0fe37993 100644 --- a/reactos/drivers/input/mouclass/makefile +++ b/reactos/drivers/input/mouclass/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.4 2001/06/22 12:28:07 ekohl Exp $ +# $Id: makefile,v 1.5 2001/07/15 21:19:00 rex Exp $ # # TARGET = mouclass @@ -14,12 +14,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) mouclass.sys + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp mouclass.sys .phony: clean diff --git a/reactos/drivers/input/psaux/makefile b/reactos/drivers/input/psaux/makefile index fc1e87661a6..0b83d202766 100644 --- a/reactos/drivers/input/psaux/makefile +++ b/reactos/drivers/input/psaux/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.4 2001/07/04 20:40:21 chorns Exp $ +# $Id: makefile,v 1.5 2001/07/15 21:19:00 rex Exp $ # # TARGET = psaux @@ -14,12 +14,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) *.o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) psaux.sys + - $(RM) *.o $(TARGET).coff junk.tmp base.tmp temp.exp psaux.sys .phony: clean diff --git a/reactos/drivers/input/sermouse/makefile b/reactos/drivers/input/sermouse/makefile index a5cb2d06804..7b733063cd2 100644 --- a/reactos/drivers/input/sermouse/makefile +++ b/reactos/drivers/input/sermouse/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.4 2001/06/22 12:28:25 ekohl Exp $ +# $Id: makefile,v 1.5 2001/07/15 21:19:00 rex Exp $ # # TARGET = sermouse @@ -14,12 +14,7 @@ all: $(TARGET).sys .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).coff - - $(RM) junk.tmp - - $(RM) base.tmp - - $(RM) temp.exp - - $(RM) sermouse.sys + - $(RM) $(TARGET).o $(TARGET).coff junk.tmp base.tmp temp.exp sermouse.sys .phony: clean diff --git a/reactos/drivers/net/afd/makefile b/reactos/drivers/net/afd/makefile index 57ecf4b888b..f9435f2d6fd 100644 --- a/reactos/drivers/net/afd/makefile +++ b/reactos/drivers/net/afd/makefile @@ -17,13 +17,8 @@ $(TARGETNAME).coff: $(TARGETNAME).rc ../../../include/reactos/resource.h OBJECTS = $(AFD_OBJECTS) $(RESOURCE_OBJECT) ../../../ntoskrnl/ntoskrnl.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = afd\*.o $(TARGETNAME).coff \ - junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = afd/*.o $(TARGETNAME).coff $ \ junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) $(CC) \ @@ -57,12 +52,10 @@ $(TARGETNAME).sys: $(OBJECTS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/dd/ne2000/Makefile b/reactos/drivers/net/dd/ne2000/Makefile index 554059925e9..6950aee6745 100644 --- a/reactos/drivers/net/dd/ne2000/Makefile +++ b/reactos/drivers/net/dd/ne2000/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 2001/07/04 21:24:02 chorns Exp $ +# $Id: Makefile,v 1.10 2001/07/15 21:19:01 rex Exp $ # # PATH_TO_TOP = ../../../.. @@ -18,17 +18,10 @@ all: $(TARGETNAME).sys $(TARGETNAME).coff: $(TARGETNAME).rc $(PATH_TO_TOP)/include/reactos/resource.h -ifeq ($(DOSCLI),yes) -CLEAN_FILES = \ - ne2000\*.o $(TARGETNAME).coff \ - $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = \ ne2000/*.o $(TARGETNAME).coff \ $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) $(DLLTOOL) \ @@ -65,12 +58,9 @@ $(TARGETNAME).sys: $(OBJECTS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) .phony: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile index 1e1079f6536..3390e8e24d4 100644 --- a/reactos/drivers/net/ndis/Makefile +++ b/reactos/drivers/net/ndis/Makefile @@ -22,13 +22,8 @@ $(TARGETNAME).coff: $(TARGETNAME).rc ../../../include/reactos/resource.h OBJECTS = $(NDIS_OBJECTS) $(RESOURCE_OBJECT) ../../../ntoskrnl/ntoskrnl.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.o objects\*.o ndis\*.o $(TARGETNAME).coff $(TARGETNAME).o $(TARGETNAME).a \ - junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = *.o objects/*.o ndis/*.o $(TARGETNAME).coff $(TARGETNAME).o $(TARGETNAME).a \ junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) $(DLLTOOL) \ @@ -68,12 +63,10 @@ $(TARGETNAME).sys: $(OBJECTS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/tcpip/makefile b/reactos/drivers/net/tcpip/makefile index 0aa2f2d3a1b..97827c0e380 100644 --- a/reactos/drivers/net/tcpip/makefile +++ b/reactos/drivers/net/tcpip/makefile @@ -52,21 +52,12 @@ OBJECTS = objects/tcpip.o objects/datalink.o objects/network.o \ $(TARGETNAME).coff: $(TARGETNAME).rc ../../../include/reactos/resource.h -ifeq ($(DOSCLI),yes) -CLEAN_FILES = \ - *.o objects\*.o tcpip\*.o datalink\*.o network\*.o \ - transport\datagram\*.o transport\rawip\*.o \ - transport\tcp\*.o transport\udp\*.o $(TARGETNAME).coff \ - $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = \ *.o objects/*.o tcpip/*.o datalink/*.o network/*.o \ transport/datagram/*.o transport/rawip/*.o \ transport/tcp/*.o transport/udp/*.o $(TARGETNAME).coff \ $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) @@ -107,12 +98,10 @@ $(TARGETNAME).sys: $(OBJECTS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/tdi/Makefile b/reactos/drivers/net/tdi/Makefile index 3cc90d30163..ed4b5226fab 100644 --- a/reactos/drivers/net/tdi/Makefile +++ b/reactos/drivers/net/tdi/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 2001/06/22 12:29:40 ekohl Exp $ +# $Id: Makefile,v 1.12 2001/07/15 21:19:01 rex Exp $ # # TDI.SYS build spec # @@ -19,19 +19,11 @@ all: $(TARGETNAME).sys misc/$(TARGETNAME).coff: misc/$(TARGETNAME).rc ../../../include/reactos/resource.h -ifeq ($(DOSCLI),yes) -CLEAN_FILES = \ - cte\*.o tdi\*.o misc\*.o misc\*.coff \ - $(TARGETNAME).o $(TARGETNAME).a \ - junk.tmp base.tmp temp.exp \ - $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = \ cte/*.o tdi/*.o misc/*.o misc/*.coff \ $(TARGETNAME).o $(TARGETNAME).a \ junk.tmp base.tmp temp.exp \ $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def $(LD) -r $(OBJECTS) -o $(TARGETNAME).o @@ -82,12 +74,10 @@ $(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/tditest/makefile b/reactos/drivers/net/tditest/makefile index 6fbffc59311..de7970aec95 100644 --- a/reactos/drivers/net/tditest/makefile +++ b/reactos/drivers/net/tditest/makefile @@ -19,13 +19,8 @@ $(TARGETNAME).coff: $(TARGETNAME).rc ../../../include/reactos/resource.h OBJECTS = $(TDITEST_OBJECTS) $(RESOURCE_OBJECT) ../../../ntoskrnl/ntoskrnl.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.o objects\*.o tditest\*.o $(TARGETNAME).coff $(TARGETNAME).o \ - junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -else CLEAN_FILES = *.o objects/*.o tditest/*.o $(TARGETNAME).coff $(TARGETNAME).o \ junk.tmp base.tmp temp.exp $(TARGETNAME).sys $(TARGETNAME).sym -endif $(TARGETNAME).sys: $(OBJECTS) $(CC) \ @@ -59,12 +54,10 @@ $(TARGETNAME).sys: $(OBJECTS) - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys diff --git a/reactos/drivers/net/wshtcpip/makefile b/reactos/drivers/net/wshtcpip/makefile index b03eb5ae84f..b617ed9e706 100644 --- a/reactos/drivers/net/wshtcpip/makefile +++ b/reactos/drivers/net/wshtcpip/makefile @@ -16,13 +16,8 @@ LIBS = ../../../lib/ntdll/ntdll.a \ ../../../lib/kernel32/kernel32.a \ ../../../lib/ws2_32/ws2_32.a -ifeq ($(DOSCLI),yes) CLEAN_FILES = $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -else -CLEAN_FILES = $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -endif all: $(TARGETNAME).dll @@ -59,12 +54,10 @@ $(TARGETNAME).dll: $(LIBS) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll diff --git a/reactos/iface/addsys/makefile b/reactos/iface/addsys/makefile index ad83f501dbc..5600a045599 100644 --- a/reactos/iface/addsys/makefile +++ b/reactos/iface/addsys/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.9 2001/07/15 18:06:23 rex Exp $ +# $Id: makefile,v 1.10 2001/07/15 21:18:54 rex Exp $ # # ReactOS Operating System # @@ -14,18 +14,14 @@ SVC_DB=w32ksvc.db SVC_MASK=0x1000 # DOS and Win32 kernels handle Unix paths too. -ifeq ($(DOSCLI),yes) -SVC_SERVICE_TABLE=..\..\subsys\win32k\main\svctab.c -SVC_GDI_STUBS=..\..\lib\gdi32\misc\win32k.c -SVC_USER_STUBS=..\..\lib\user32\misc\win32k.c -else SVC_SERVICE_TABLE=../../subsys/win32k/main/svctab.c SVC_GDI_STUBS=../../lib/gdi32/misc/win32k.c SVC_USER_STUBS=../../lib/user32/misc/win32k.c -endif SVC_FILES = $(SVC_GDI_STUBS) $(SVC_USER_STUBS) $(SVC_SERVICE_TABLE) +CLEAN_FILES = $(TARGETNAME)$(EXE_POSTFIX) $(SVC_FILES) + BASE_CFLAGS = -I../../include all: $(SVC_FILES) @@ -53,10 +49,7 @@ $(SVC_FILES): $(SVC_DB) $(TARGETNAME)$(EXE_POSTFIX) clean: - - $(RM) $(TARGETNAME)$(EXE_POSTFIX) - - $(RM) $(SVC_GDI_STUBS) - - $(RM) $(SVC_USER_STUBS) - - $(RM) $(SVC_SERVICE_TABLE) + - $(RM) $(CLEAN_FILES) .PHONY: all clean diff --git a/reactos/iface/native/makefile b/reactos/iface/native/makefile index 32cc5bbe390..ad281f7c257 100644 --- a/reactos/iface/native/makefile +++ b/reactos/iface/native/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.11 2000/10/07 13:41:45 dwelch Exp $ +# $Id: makefile,v 1.12 2001/07/15 21:18:54 rex Exp $ # # ReactOS Operating System # @@ -33,16 +33,7 @@ $(TARGET)$(EXE_POSTFIX): $(TARGET).c $(HOST_CC) -g $(TARGET).c -o $(TARGET)$(EXE_POSTFIX) clean: - - $(RM) $(TARGET)$(EXE_POSTFIX) -ifeq ($(DOSCLI),yes) - - $(RM) ..\..\lib\ntdll\napi.c - - $(RM) ..\..\include\ntdll\napi.h - - $(RM) ..\..\ntoskrnl\nt\zw.c -else - - $(RM) $(NTDLL_STUBS) - - $(RM) $(KERNEL_SERVICE_TABLE) - - $(RM) $(KERNEL_ZW_CALLS) -endif + - $(RM) $(TARGET)$(EXE_POSTFIX) $(NTDLL_STUBS) $(KERNEL_SERVICE_TABLE) $(KERNEL_ZW_CALLS) .PHONY: all clean diff --git a/reactos/lib/advapi32/makefile b/reactos/lib/advapi32/makefile index b3a1f0663b1..7a4c123248d 100644 --- a/reactos/lib/advapi32/makefile +++ b/reactos/lib/advapi32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.17 2001/03/17 22:05:25 ea Exp $ +# $Id: makefile,v 1.18 2001/07/15 21:18:54 rex Exp $ # # Makefile for ReactOS advapi32.dll # @@ -46,15 +46,9 @@ OBJECTS=\ $(TOKEN_OBJECTS) \ $(RESOURCE_OBJECT) -ifeq ($(DOSCLI),yes) -CLEAN_FILES = misc\*.o reg\*.o sec\*.o service\*.o token\*.o \ - $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -else CLEAN_FILES = misc/*.o reg/*.o sec/*.o service/*.o token/*.o \ $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -endif all: $(DLLTARGET) @@ -104,13 +98,10 @@ $(TARGETNAME).dll: $(DLLMAIN) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile index efef664c321..db1804fcfe5 100644 --- a/reactos/lib/crtdll/makefile +++ b/reactos/lib/crtdll/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.44 2001/02/01 16:44:19 jean Exp $ +# $Id: makefile,v 1.45 2001/07/15 21:18:54 rex Exp $ # # ReactOS Operating System # @@ -145,22 +145,12 @@ OBJECTS = $(MISC_OBJECTS) $(STDLIB_OBJECTS) $(IO_OBJECTS) \ $(SIGNAL_OBJECTS) $(SETJMP_OBJECTS) $(RESOURCE_OBJECT) \ $(LOCALE_OBJECTS) $(EXCEPT_OBJECTS) $(TCHAR_OBJECTS) -ifeq ($(DOSCLI), yes) -CLEAN_FILES = assert\*.o conio\*.o ctype\*.o direct\*.o dirent\*.o \ - except\*.o float\*.o io\*.o libc\*.o locale\*.o malloc\*.o \ - math\*.o mbstring\*.o misc\*.o process\*.o quad\*.o search\*.o \ - setjmp\*.o signal\*.o stdio\*.o stdlib\*.o string\*.o sys_stat\*.o \ - tchar\*.o time\*.o wchar\*.o \ - $(TARGET).a $(TARGET).o $(TARGET).dll $(TARGET).sym \ - $(TARGET).coff -else CLEAN_FILES = assert/*.o conio/*.o ctype/*.o direct/*.o dirent/*.o \ except/*.o float/*.o io/*.o libc/*.o locale/*.o malloc/*.o \ math/*.o mbstring/*.o misc/*.o process/*.o quad/*.o search/*.o \ setjmp/*.o stdio/*.o stdlib/*.o string/*.o sys_stat/*.o tchar/*.o \ time/*.o wchar/*.o $(TARGET).a $(TARGET).o $(TARGET).dll $(TARGET).sym \ $(TARGET).coff $(SIGNAL_OBJECTS) -endif $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h @@ -202,10 +192,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* +.phony: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/fmifs/makefile b/reactos/lib/fmifs/makefile index 5fc72e3192c..e195f239596 100644 --- a/reactos/lib/fmifs/makefile +++ b/reactos/lib/fmifs/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.12 2001/06/25 14:20:44 ekohl Exp $ +# $Id: makefile,v 1.13 2001/07/15 21:18:54 rex Exp $ # # Makefile for fmifs.dll # @@ -66,12 +66,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile index 1a19f20c7b9..3ac40685ed9 100644 --- a/reactos/lib/gdi32/makefile +++ b/reactos/lib/gdi32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.17 2000/11/20 19:59:08 ekohl Exp $ +# $Id: makefile,v 1.18 2001/07/15 21:18:54 rex Exp $ # # Makefile for ReactOS gdi32.dll # @@ -61,18 +61,12 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.a *.o *.coff *.sym *.tmp *.dll main\*.o misc\*.o objects\*.o -else CLEAN_FILES = *.a *.o *.coff *.sym *.tmp *.dll main/*.o misc/*.o objects/*.o -endif -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile index 7f14210cf28..afa57a80f56 100644 --- a/reactos/lib/kernel32/makefile +++ b/reactos/lib/kernel32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.47 2001/04/05 01:53:57 ekohl Exp $ +# $Id: makefile,v 1.48 2001/07/15 21:18:54 rex Exp $ # # ReactOS Operating System # @@ -74,17 +74,10 @@ OBJECTS = $(MISC_OBJECTS) $(FILE_OBJECTS) $(THREAD_OBJECTS) \ $(PROCESS_OBJECTS) $(STRING_OBJECTS) $(MEM_OBJECTS) \ $(SYNCH_OBJECTS) $(EXCEPT_OBJECTS) $(RESOURCE_OBJECT) -ifeq ($(DOSCLI),yes) -CLEAN_FILES = except\*.o file\*.o mem\*.o misc\*.o nls\*.o \ - process\*.o string\*.o synch\*.o thread\*.o \ - $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ - $(TARGET).dll $(TARGET).sym $(TARGET).coff -else CLEAN_FILES = except/*.o file/*.o mem/*.o misc/*.o nls/*.o \ process/*.o string/*.o synch/*.o thread/*.o \ $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ $(TARGET).dll $(TARGET).sym $(TARGET).coff -endif nls/ole2nls.o: nls/ole2nls.c $(CC) $(CFLAGS) -I. nls/ole2nls.c @@ -130,12 +123,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/msafd/makefile b/reactos/lib/msafd/makefile index f420a3cb7b3..43f363201be 100644 --- a/reactos/lib/msafd/makefile +++ b/reactos/lib/msafd/makefile @@ -16,15 +16,9 @@ OBJECTS = $(MISC_OBJECTS) $(RESOURCE_OBJECT) LIBS = ../ntdll/ntdll.a \ ../kernel32/kernel32.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = misc\*.o \ - $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -else CLEAN_FILES = misc/*.o \ $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -endif all: $(TARGETNAME).dll @@ -66,12 +60,10 @@ $(TARGETNAME).dll: $(LIBS) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll diff --git a/reactos/lib/msvcrt/Makefile b/reactos/lib/msvcrt/Makefile index 1b8509dad56..4e2ccbcf93e 100644 --- a/reactos/lib/msvcrt/Makefile +++ b/reactos/lib/msvcrt/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.17 2001/07/12 16:31:03 ekohl Exp $ +# $Id: Makefile,v 1.18 2001/07/15 21:18:55 rex Exp $ # # ReactOS Operating System # @@ -365,60 +365,11 @@ OBJECTS = \ $(OBJECTS_WSTRING) \ msvcrt.coff -ifeq ($(DOSCLI), yes) -CLEAN_FILES = \ - conio\*.o \ - ctype\*.o \ - direct\*.o \ - except\*.o \ - float\*.o \ - io\*.o \ - locale\*.o \ - math\*.o \ - misc\*.o \ - process\*.o \ - search\*.o \ - setjmp\*.o \ - signal\*.o \ - stdio\*.o \ - stdlib\*.o \ - string\*.o \ - sys_stat\*.o \ - time\*.o \ - wstring\*.o \ - $(TARGET_NAME).a \ - $(TARGET_NAME).coff \ - $(TARGET_NAME).o \ - $(TARGET_NAME).dll \ - $(TARGET_NAME).sym \ - base.tmp -else -CLEAN_FILES = \ - conio/*.o \ - ctype/*.o \ - direct/*.o \ - except/*.o \ - float/*.o \ - io/*.o \ - locale/*.o \ - math/*.o \ - misc/*.o \ - process/*.o \ - search/*.o \ - setjmp/*.o \ - signal/*.o \ - stdio/*.o \ - stdlib/*.o \ - string/*.o \ - sys_stat/*.o \ - time/*.o \ - wstring/*.o \ - $(TARGET_NAME).a \ - $(TARGET_NAME).coff \ - $(TARGET_NAME).o \ - $(TARGET_NAME).dll \ - $(TARGET_NAME).sym -endif +CLEAN_FILES = conio/*.o ctype/*.o direct/*.o except/*.o float/*.o io/*.o \ + locale/*.o math/*.o misc/*.o process/*.o search/*.o setjmp/*.o \ + signal/*.o stdio/*.o stdlib/*.o string/*.o sys_stat/*.o time/*.o \ + wstring/*.o $(TARGET_NAME).a $(TARGET_NAME).coff $(TARGET_NAME).o \ + $(TARGET_NAME).dll $(TARGET_NAME).sym $(TARGET_NAME).coff: $(TARGET_NAME).rc ../../include/reactos/resource.h @@ -460,10 +411,10 @@ $(TARGET_NAME).dll: $(DLLMAIN) $(OBJECTS) $(TARGET_NAME).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET_NAME).dll > $(TARGET_NAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* +.phony: clean install: $(FLOPPY_DIR)/dlls/$(TARGET_NAME).dll diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile index 99ba66d13de..76c92493093 100644 --- a/reactos/lib/ntdll/makefile +++ b/reactos/lib/ntdll/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.62 2001/06/17 20:05:09 ea Exp $ +# $Id: makefile,v 1.63 2001/07/15 21:18:55 rex Exp $ # # ReactOS Operating System # @@ -50,16 +50,9 @@ OBJECTS = napi.o ldr/startup.o $(DBG_OBJECTS) $(RTL_OBJECTS) \ $(STDIO_OBJECTS) $(STDLIB_OBJECTS) $(STRING_OBJECTS) \ stubs/stubs.o ldr/utils.o $(CSR_OBJECTS) $(TARGET).coff -ifeq ($(DOSCLI),yes) -CLEAN_FILES = napi.o csr\*.o dbg\*.o ldr\*.o rtl\*.o stdio\*.o stdlib\*.o \ - string\*.o stubs\*.o \ - $(TARGET).a main\dllmain.o $(TARGET).o $(TARGET).dll junk.tmp \ - base.tmp temp.exp $(TARGET).sym $(TARGET).coff -else CLEAN_FILES = napi.o ldr/*.o rtl/*.o stdio/*.o stdlib/*.o string/*.o stubs/*.o csr/*.o dbg/*.o \ $(TARGET).a main/dllmain.o $(TARGET).o $(TARGET).dll junk.tmp \ base.tmp temp.exp $(TARGET).sym $(TARGET).coff -endif $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h @@ -103,12 +96,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) def/ntdll.def def/ntdll.edf $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/ole32/makefile b/reactos/lib/ole32/makefile index 9a868c98994..91b2a29c5c7 100644 --- a/reactos/lib/ole32/makefile +++ b/reactos/lib/ole32/makefile @@ -22,15 +22,9 @@ OBJECTS=\ Storage.o -ifeq ($(DOSCLI),yes) CLEAN_FILES = *.o \ $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym -else -CLEAN_FILES = *.o \ - $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym -endif all: $(DLLTARGET) @@ -76,12 +70,9 @@ $(TARGETNAME).dll: $(DLLMAIN) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) +.PHONY: clean include ../../rules.mak diff --git a/reactos/lib/rpcrt4/Makefile b/reactos/lib/rpcrt4/Makefile index 994725c9bfb..762d27f4e06 100644 --- a/reactos/lib/rpcrt4/Makefile +++ b/reactos/lib/rpcrt4/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2000/11/20 19:59:09 ekohl Exp $ +# $Id: Makefile,v 1.5 2001/07/15 21:18:55 rex Exp $ # # ReactOS Operating System # @@ -69,17 +69,10 @@ OBJECTS = $(MISC_OBJECTS) $(FILE_OBJECTS) $(THREAD_OBJECTS) \ $(INTERNAL_OBJECTS) $(SYNCH_OBJECTS) $(EXCEPT_OBJECTS) \ $(RESOURCE_OBJECT) -ifeq ($(DOSCLI),yes) -CLEAN_FILES = except\*.o file\*.o internal\*.o mem\*.o misc\*.o nls\*.o \ - process\*.o string\*.o synch\*.o thread\*.o \ - $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ - $(TARGET).dll $(TARGET).sym $(TARGET).coff -else CLEAN_FILES = except/*.o file/*.o internal/*.o mem/*.o misc/*.o nls/*.o \ process/*.o string/*.o synch/*.o thread/*.o \ $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \ $(TARGET).dll $(TARGET).sym $(TARGET).coff -endif nls/ole2nls.o: nls/ole2nls.c $(CC) $(CFLAGS) -I. nls/ole2nls.c @@ -125,12 +118,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/secur32/Makefile b/reactos/lib/secur32/Makefile index 9ad296a44ef..cbb682c0db4 100644 --- a/reactos/lib/secur32/Makefile +++ b/reactos/lib/secur32/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 2000/11/20 19:59:09 ekohl Exp $ +# $Id: Makefile,v 1.6 2001/07/15 21:18:55 rex Exp $ # # ReactOS Operating System # @@ -59,12 +59,10 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/shell32/makefile b/reactos/lib/shell32/makefile index 9df7838d146..113712fda4f 100644 --- a/reactos/lib/shell32/makefile +++ b/reactos/lib/shell32/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 2001/07/06 04:01:27 rex Exp $ +# $Id: makefile,v 1.3 2001/07/15 21:18:55 rex Exp $ # # Makefile for ReactOS shell32.dll # @@ -19,15 +19,9 @@ MISC_OBJECTS=\ OBJECTS=\ $(MISC_OBJECTS) -ifeq ($(DOSCLI),yes) -CLEAN_FILES = misc\*.o \ - $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -else CLEAN_FILES = misc/*.o \ $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -endif all: $(DLLTARGET) @@ -77,13 +71,10 @@ $(TARGETNAME).dll: $(DLLMAIN) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll diff --git a/reactos/lib/user32/makefile_rex b/reactos/lib/user32/makefile_rex index 84bd78afd41..85e7cb35d3b 100644 --- a/reactos/lib/user32/makefile_rex +++ b/reactos/lib/user32/makefile_rex @@ -1,4 +1,4 @@ -# $Id: makefile_rex,v 1.18 2001/06/18 03:05:54 phreak Exp $ +# $Id: makefile_rex,v 1.19 2001/07/15 21:18:56 rex Exp $ # # ReactOS Operating System # @@ -33,13 +33,8 @@ LIBS = ../ntdll/ntdll.a \ ../kernel32/kernel32.a \ ../gdi32/gdi32.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = misc\*.o windows\*.o internal\*.o controls\*.o graphics\*.o resources\*.o \ - $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp $(TARGET).dll $(TARGET).sym -else CLEAN_FILES = misc/*.o windows/*.o internal/*.o controls/*.o graphics/*.o resources/*.o \ $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp $(TARGET).dll $(TARGET).sym -endif all: $(TARGET).dll @@ -82,12 +77,10 @@ $(TARGET).dll: $(LIBS) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/version/makefile b/reactos/lib/version/makefile index 249f766a635..8c702a4dbc7 100644 --- a/reactos/lib/version/makefile +++ b/reactos/lib/version/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.6 2000/11/20 19:59:09 ekohl Exp $ +# $Id: makefile,v 1.7 2001/07/15 21:18:56 rex Exp $ # # Makefile for ReactOS version.dll # @@ -57,18 +57,12 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).dll > $(TARGET).sym -ifeq ($(DOSCLI),yes) -CLEAN_FILES = *.o *.a *.coff *.sym *.tmp *.dll main\*.o misc\*.o -else CLEAN_FILES = *.o *.a *.coff *.sym *.tmp *.dll main/*.o misc/*.o -endif -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGET).dll diff --git a/reactos/lib/ws2_32/makefile b/reactos/lib/ws2_32/makefile index a590ef6c5da..2683f50779f 100644 --- a/reactos/lib/ws2_32/makefile +++ b/reactos/lib/ws2_32/makefile @@ -18,15 +18,9 @@ LIBS = ../ntdll/ntdll.a \ ../kernel32/kernel32.a \ ../advapi32/advapi32.a -ifeq ($(DOSCLI),yes) -CLEAN_FILES = misc\*.o \ - $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -else CLEAN_FILES = misc/*.o \ $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).dll $(TARGETNAME).sym $(TARGETNAME).coff -endif all: $(TARGETNAME).dll @@ -68,12 +62,10 @@ $(TARGETNAME).dll: $(LIBS) $(OBJECTS) $(TARGETNAME).def $(NM) --numeric-sort $(TARGETNAME).dll > $(TARGETNAME).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile index ed0b96cccee..7d2c8fe00a3 100644 --- a/reactos/ntoskrnl/Makefile +++ b/reactos/ntoskrnl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.47 2001/07/15 18:06:23 rex Exp $ +# $Id: Makefile,v 1.48 2001/07/15 21:18:56 rex Exp $ # # ReactOS Operating System # @@ -490,21 +490,11 @@ OBJECTS := \ $(OBJECTS_RESOURCE) -ifeq ($(DOSCLI),yes) -CLEAN_FILES = $(OBJECTS_PATH)\*.o cc\*.o cm\*.o dbg\*.o dbg\i386\*.o ex\*.o hal\x86\*.o io\*.o \ - ke\*.o ldr\*.o mm\*.o nt\*.o ob\*.o ps\*.o rtl\*.o se\*.o \ - ke\i386\*.o mm\i386\*.o fs\*.o po\*.o nls\*.o lpc\*.o \ - kd\*.o $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ - $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym $(TARGETNAME).coff \ - $(subst /,\,$(D1_FILES)) -else CLEAN_FILES = $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o hal/x86/*.o io/*.o \ ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o rtl/*.o se/*.o \ ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o lpc/*.o \ kd/*.o $(TARGETNAME).o $(TARGETNAME).a junk.tmp base.tmp temp.exp \ $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym $(TARGETNAME).coff $(D1_FILES) -endif - $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(TARGETNAME).a $(IE_DATA) $(CC) \ @@ -624,12 +614,10 @@ $(TARGETNAME).a: $(TARGETNAME).def --output-lib $(TARGETNAME).a \ --kill-at -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/$(TARGETNAME).exe diff --git a/reactos/rdel.c b/reactos/rdel.c new file mode 100644 index 00000000000..e812ba7f01f --- /dev/null +++ b/reactos/rdel.c @@ -0,0 +1,89 @@ +/* $Id: rdel.c,v 1.1 2001/07/15 21:18:48 rex Exp $ + * COPYRIGHT: See COPYING in the top level directory + * PROGRAMMER: Rex Jolliff (rex@lvcablemodem.com) + * PURPOSE: Platform independant delete command + */ + +#include +#include +#include +#include +#include +#include +#include + +void +convertPath (char * pathToConvert) +{ + while (*pathToConvert != 0) + { + if (*pathToConvert == '\\') + { + *pathToConvert = '/'; + } + pathToConvert++; + } +} + +void +getDirectory (const char *filename, char * directorySpec) +{ + int lengthOfDirectory; + + if (strrchr (filename, '/') != 0) + { + lengthOfDirectory = strrchr (filename, '/') - filename; + strncpy (directorySpec, filename, lengthOfDirectory); + directorySpec [lengthOfDirectory] = '\0'; + } + else + { + strcpy (directorySpec, "."); + } +} + +void +getFilename (const char *filename, char * fileSpec) +{ + if (strrchr (filename, '/') != 0) + { + strcpy (fileSpec, strrchr (filename, '/') + 1); + } + else + { + strcpy (fileSpec, filename); + } +} + +int +main (int argc, char* argv[]) +{ + int justPrint = 0; + int idx; + int returnCode; + + for (idx = 1; idx < argc; idx++) + { + convertPath (argv [idx]); + + if (justPrint) + { + printf ("delete %s\n", argv [idx]); + } + else + { + returnCode = remove (argv [idx]); + if (returnCode != 0 && errno != ENOENT) + { + printf ("Unlink of %s failed. Unlink returned %d.\n", + argv [idx], + returnCode); + return returnCode; + } + } + } + + return 0; +} + + diff --git a/reactos/rules.mak b/reactos/rules.mak index 02ca0a31146..48826bc0aa9 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -44,7 +44,7 @@ EXE_POSTFIX := .exe CP = $(PATH_TO_TOP)/rcopy DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as NASM_CMD = nasmw -RM = del +RM = $(PATH_TO_TOP)/rdel RMDIR = rmdir #KM_SPECS = specs DOSCLI = yes diff --git a/reactos/services/lsass/makefile b/reactos/services/lsass/makefile index 1b9f9354ce4..64c82e03f7f 100644 --- a/reactos/services/lsass/makefile +++ b/reactos/services/lsass/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.2 1999/08/29 13:45:05 dwelch Exp $ +# $Id: makefile,v 1.3 2001/07/15 21:19:00 rex Exp $ # # Local Security Authority Subsystem # @@ -17,10 +17,7 @@ all: $(TARGET).exe .phony: all clean: - - $(RM) $(TARGET).o - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff + - $(RM) $(TARGET).o $(TARGET).exe $(TARGET).sym $(TARGET).coff .phony: clean diff --git a/reactos/subsys/csrss/makefile b/reactos/subsys/csrss/makefile index 81c229ab272..dc21ad1c9b6 100644 --- a/reactos/subsys/csrss/makefile +++ b/reactos/subsys/csrss/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.13 2001/06/25 12:32:27 ekohl Exp $ +# $Id: makefile,v 1.14 2001/07/15 21:19:02 rex Exp $ # # CSRSS: Client/server runtime subsystem # @@ -18,6 +18,8 @@ OBJECTS_MISC = $(TARGET).o init.o print.o video.o $(TARGET).coff OBJECTS = $(OBJECTS_API) $(OBJECTS_SBAPI) $(OBJECTS_MISC) +CLEAN_FILES = $(OBJECTS) $(TARGET).exe + LIBS = ../../lib/ntdll/ntdll.a all: $(TARGET).exe @@ -25,17 +27,7 @@ all: $(TARGET).exe .phony: all clean: -ifeq ($(DOSCLI),yes) - - $(RM) api\*.o - - $(RM) sbapi\*.o -else - - $(RM) api/*.o - - $(RM) sbapi/*.o -endif - - $(RM) *.o - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff + - $(RM) $(CLEAN_FILES) .phony: clean diff --git a/reactos/subsys/smss/makefile b/reactos/subsys/smss/makefile index b48789b738c..2d2217cb727 100644 --- a/reactos/subsys/smss/makefile +++ b/reactos/subsys/smss/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.7 2001/06/25 12:32:39 ekohl Exp $ +# $Id: makefile,v 1.8 2001/07/15 21:19:02 rex Exp $ # # Session Manager # @@ -32,13 +32,10 @@ $(TARGET).exe: $(OBJECTS) $(LIBS) $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) +.PHONY: clean install: $(FLOPPY_DIR)/subsys/$(TARGET).exe diff --git a/reactos/subsys/system/services/makefile b/reactos/subsys/system/services/makefile index 2e56c5a1400..e5f334a59ef 100644 --- a/reactos/subsys/system/services/makefile +++ b/reactos/subsys/system/services/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2000/12/05 02:38:08 ekohl Exp $ +# $Id: makefile,v 1.2 2001/07/15 21:18:53 rex Exp $ # # Services: Service control manager (SCM) # @@ -24,12 +24,10 @@ $(TARGET).exe: $(OBJECTS) $(LIBS) $(CC) $(OBJECTS) $(LIBS) -o $(TARGET).exe $(NM) --numeric-sort $(TARGET).exe > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/subsys/system/shell/makefile b/reactos/subsys/system/shell/makefile index 2364e4c2fd1..7be1415a963 100644 --- a/reactos/subsys/system/shell/makefile +++ b/reactos/subsys/system/shell/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.3 2001/02/19 15:04:50 dwelch Exp $ +# $Id: makefile,v 1.4 2001/07/15 21:18:53 rex Exp $ # # Shell: Simple shell application # @@ -21,12 +21,10 @@ shell.exe: $(OBJECTS) $(LIBS) $(CC) $(OBJECTS) $(LIBS) -o shell.exe $(NM) --numeric-sort shell.exe > shell.sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) +.phony: clean install: $(PROGS:%=$(FLOPPY_DIR)/apps/%) diff --git a/reactos/subsys/system/winlogon/makefile b/reactos/subsys/system/winlogon/makefile index 1a79dc9d4be..a1e182a519e 100644 --- a/reactos/subsys/system/winlogon/makefile +++ b/reactos/subsys/system/winlogon/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.3 2001/06/12 17:50:26 chorns Exp $ +# $Id: makefile,v 1.4 2001/07/15 21:18:53 rex Exp $ # # Logon/login Application # @@ -22,10 +22,7 @@ all: $(TARGET).exe .phony: all clean: - - $(RM) *.o - - $(RM) $(TARGET).exe - - $(RM) $(TARGET).sym - - $(RM) $(TARGET).coff + - $(RM) *.o $(TARGET).exe $(TARGET).sym $(TARGET).coff .phony: clean diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile index c9d652782aa..240be3c1a98 100644 --- a/reactos/subsys/win32k/makefile +++ b/reactos/subsys/win32k/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.36 2001/07/06 00:05:05 rex Exp $ +# $Id: makefile,v 1.37 2001/07/15 21:19:02 rex Exp $ # # WIN32K.SYS build spec # @@ -47,17 +47,10 @@ all: $(TARGET).sys $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h -ifeq ($(DOSCLI),yes) -CLEAN_FILES = dib\*.o eng\*.o freetype\*.o ldr\*.o main\*.o misc\*.o ntuser\*.o \ - objects\*.o stubs\*.o \ - $(TARGET).coff $(TARGET).o $(TARGET).a \ - junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sym -else CLEAN_FILES = dib/*.o eng/*.o freetype/*.o ldr/*.o main/*.o misc/*.o ntuser/*.o \ objects/*.o stubs/*.o \ $(TARGET).coff $(TARGET).o $(TARGET).a \ junk.tmp base.tmp temp.exp $(TARGET).sys $(TARGET).sym -endif $(TARGET).sys: $(OBJECTS) $(TARGET).def $(LD) -r $(OBJECTS) -o $(TARGET).o @@ -109,12 +102,10 @@ $(TARGET).sys: $(OBJECTS) $(TARGET).def - $(RM) temp.exp $(NM) --numeric-sort $(TARGET).sys > $(TARGET).sym -clean: $(CLEAN_FILES:%=%_clean) +clean: + - $(RM) $(CLEAN_FILES) -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.PHONY: clean $(CLEAN_FILES:%=%_clean) +.PHONY: clean install: $(FLOPPY_DIR)/drivers/$(TARGET).sys