Modified makefiles for use with rcopy

Added a missing prototype svn path=/trunk/; revision=1433
2024-12-27 01:24:38 +00:00 · 2000-11-20 19:59:14 +00:00 · 2000-11-20 19:59:14 +00:00 · 716fa2a717
commit 716fa2a717
parent d456e5b838
58 changed files with 92 additions and 499 deletions
--- a/reactos/apps/tests/apc/makefile
+++ b/reactos/apps/tests/apc/makefile
@ -26,20 +26,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 apc.exe: $(OBJECTS) $(LIBS)
 	$(LD) $(OBJECTS) $(LIBS) -o apc.exe
--- a/reactos/apps/tests/args/makefile
+++ b/reactos/apps/tests/args/makefile
@ -22,20 +22,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 args.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) -o args.exe
--- a/reactos/apps/tests/bench/makefile
+++ b/reactos/apps/tests/bench/makefile
@ -21,20 +21,12 @@ $(PROGS:%=%_clean): %_clean:
 install: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)

 $(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe ..\..\$(DIST_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-endif

 bench-thread.exe: bench-thread.c
 	$(CC) $(CFLAGS) bench-thread.c -lkernel32 -o bench-thread.exe
--- a/reactos/apps/tests/consume/Makefile
+++ b/reactos/apps/tests/consume/Makefile
@ -20,20 +20,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 consume.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) -o consume.exe
--- a/reactos/apps/tests/dump_shared_data/makefile
+++ b/reactos/apps/tests/dump_shared_data/makefile
@ -20,20 +20,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 dump_shared_data.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) -o dump_shared_data.exe
--- a/reactos/apps/tests/event/makefile
+++ b/reactos/apps/tests/event/makefile
@ -21,20 +21,12 @@ $(PROGS:%=%_clean): %_clean:
 install: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)

 $(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe ..\..\$(DIST_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-endif

 event.exe: event.c
 	$(CC) $(CFLAGS) event.c -lkernel32 -o event.exe
--- a/reactos/apps/tests/file/Makefile
+++ b/reactos/apps/tests/file/Makefile
@ -22,20 +22,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 file.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) $(BASE_CFLAGS) -o file.exe
--- a/reactos/apps/tests/hello/makefile
+++ b/reactos/apps/tests/hello/makefile
@ -20,20 +20,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 hello.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) -o hello.exe
--- a/reactos/apps/tests/lpc/makefile
+++ b/reactos/apps/tests/lpc/makefile
@ -29,20 +29,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 lpcsrv.exe: $(SRV_OBJECTS) $(LIBS)
 	$(LD) $(SRV_OBJECTS) $(LIBS) -o lpcsrv.exe
--- a/reactos/apps/tests/pteb/Makefile
+++ b/reactos/apps/tests/pteb/Makefile
@ -20,20 +20,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 pteb.exe: $(OBJECTS)
 	$(CC) $(OBJECTS) -o pteb.exe
--- a/reactos/apps/tests/regtest/makefile
+++ b/reactos/apps/tests/regtest/makefile
@ -24,20 +24,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 regtest.exe: $(OBJECTS) $(LIBS)
 	$(CC) -nostartfiles -nostdlib $(OBJECTS) $(LIBS) -lgcc -o regtest.exe
--- a/reactos/apps/tests/shm/makefile
+++ b/reactos/apps/tests/shm/makefile
@ -26,20 +26,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 shmsrv.exe: $(SRV_OBJECTS) $(LIBS)
 	$(LD) $(SRV_OBJECTS) $(LIBS) -o shmsrv.exe
--- a/reactos/apps/tests/test_old/makefile
+++ b/reactos/apps/tests/test_old/makefile
@ -22,20 +22,12 @@ clean: $(PROGS:%=%_clean)
 install: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)

 $(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe ..\..\$(DIST_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-endif

 bug2.exe: bug2.c
 	$(CC) bug2.c -lkernel32 -o bug2.exe
--- a/reactos/apps/tests/thread/makefile
+++ b/reactos/apps/tests/thread/makefile
@ -21,20 +21,12 @@ $(PROGS:%=%_clean): %_clean:
 install: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe $(FLOPPY_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)

 $(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $*.exe ..\..\$(DIST_DIR)\apps\$*.exe
-else
 	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
-endif

 thread.exe: thread.c
 	$(CC) $(CFLAGS) thread.c -lkernel32 -o thread.exe
--- a/reactos/apps/utils/cat/makefile
+++ b/reactos/apps/utils/cat/makefile
@ -20,20 +20,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 .PHONY: floppy dist

--- a/reactos/apps/utils/net/ping/makefile
+++ b/reactos/apps/utils/net/ping/makefile
@ -25,20 +25,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 $(TARGETNAME).exe: $(OBJECTS) $(LIBS)
 	$(CC) $(OBJECTS) $(LIBS) -o $(TARGETNAME).exe
--- a/reactos/apps/utils/objdir/makefile
+++ b/reactos/apps/utils/objdir/makefile
@ -30,20 +30,12 @@ clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 $(TARGET_NAME).exe: $(OBJECTS) $(LIBS)
 	$(CC) $(OBJECTS) $(LIBS) -o $(TARGET_NAME).exe
--- a/reactos/apps/utils/shell/makefile
+++ b/reactos/apps/utils/shell/makefile
@ -22,20 +22,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(PROGS:%=$(FLOPPY_DIR)/apps/%)

 $(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* $(FLOPPY_DIR)\apps\$*
-else
 	$(CP) $* $(FLOPPY_DIR)/apps/$*
-endif

 dist: $(PROGS:%=../../$(DIST_DIR)/apps/%)

 $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
-ifeq ($(DOSCLI),yes)
-	$(CP) $* ..\..\$(DIST_DIR)\apps\$*
-else
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
-endif

 shell.exe: $(OBJECTS) $(LIBS)
 	$(CC) $(OBJECTS) $(LIBS) -lgcc -o shell.exe
--- a/reactos/drivers/dd/beep/makefile
+++ b/reactos/drivers/dd/beep/makefile
@ -1,14 +1,15 @@
-# $Id: makefile,v 1.8 2000/08/18 22:27:04 dwelch Exp $
+# $Id: makefile,v 1.9 2000/11/20 19:59:10 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..

 TARGET = beep
-OBJECTS = beep.o beep.coff ../../../ntoskrnl/ntoskrnl.a

 BASE_CFLAGS = -I../../../include

-all: beep.sys
+OBJECTS = beep.o beep.coff ../../../ntoskrnl/ntoskrnl.a
+
+all: $(TARGET).sys $(TARGET).sys.unstripped

 .PHONY: all

@ -18,56 +19,22 @@ clean:
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) beep.sys
+	- $(RM) $(TARGET).sys
+	- $(RM) $(TARGET).sys.unstripped

 .phony: clean

 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

+$(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)

-beep.sys: $(OBJECTS)
-	$(CC) \
-		-specs=../../svc_specs \
-		-mdll \
-		-o junk.tmp \
-		-Wl,--defsym,_end=end \
-		-Wl,--defsym,_edata=__data_end__ \
-		-Wl,--defsym,_etext=etext \
-		-Wl,--base-file,base.tmp \
-		$(OBJECTS)
-	- $(RM) junk.tmp
-	$(DLLTOOL) \
-		--dllname beep.sys \
-		--base-file base.tmp \
-		--output-exp temp.exp \
-		--kill-at
-	- $(RM) base.tmp
-	$(CC) \
-		--verbose \
-		-Wl,--image-base,0x10000 \
-		-Wl,-e,_DriverEntry@8 \
-		-Wl,temp.exp \
-		-specs=../../svc_specs \
-		-mdll \
-		-o $(TARGET).sys \
-		$(OBJECTS)
-	- $(RM) temp.exp
-
+WARNINGS_ARE_ERRORS = yes
 include ../../../rules.mak
-
--- a/reactos/drivers/dd/ide/makefile
+++ b/reactos/drivers/dd/ide/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.19 2000/10/07 13:41:55 dwelch Exp $
+# $Id: makefile,v 1.20 2000/11/20 19:59:10 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -27,20 +27,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)

--- a/reactos/drivers/dd/mouse/makefile
+++ b/reactos/drivers/dd/mouse/makefile
@ -22,20 +22,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 mouse.sys: $(OBJECTS)
 	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
--- a/reactos/drivers/dd/null/makefile
+++ b/reactos/drivers/dd/null/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.9 2000/08/18 22:27:06 dwelch Exp $
+# $Id: makefile,v 1.10 2000/11/20 19:59:10 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -25,20 +25,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys

 ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
-endif

 $(TARGETNAME).sys: $(OBJECTS)
 	$(CC) \
--- a/reactos/drivers/dd/parallel/makefile
+++ b/reactos/drivers/dd/parallel/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2000/08/18 22:27:06 dwelch Exp $
+# $Id: makefile,v 1.11 2000/11/20 19:59:10 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -25,20 +25,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys: $(OBJECTS)
 	$(CC) \
--- a/reactos/drivers/dd/serial/makefile
+++ b/reactos/drivers/dd/serial/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2000/08/18 22:27:07 dwelch Exp $
+# $Id: makefile,v 1.11 2000/11/20 19:59:10 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -25,20 +25,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys: $(OBJECTS)
 	$(CC) \
--- a/reactos/drivers/dd/vga/display/makefile
+++ b/reactos/drivers/dd/vga/display/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.12 2000/10/14 22:40:17 jfilby Exp $
+# $Id: makefile,v 1.13 2000/11/20 19:59:11 ekohl Exp $
 #
 # Makefile for ReactOS vgaddi.dll
 #
@ -83,20 +83,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../../../rules.mak

--- a/reactos/drivers/dd/vga/miniport/makefile
+++ b/reactos/drivers/dd/vga/miniport/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.4 2000/10/07 13:41:55 dwelch Exp $
+# $Id: makefile,v 1.5 2000/11/20 19:59:11 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../../..
@ -51,20 +51,12 @@ vgamp.sys: $(MP_OBJECTS)
 install: $(FLOPPY_DIR)/drivers/vgamp.sys

 $(FLOPPY_DIR)/drivers/vgamp.sys: vgamp.sys
-ifeq ($(DOSCLI),yes)
-	$(CP) vgamp.sys $(FLOPPY_DIR)\drivers\vgamp.sys
-else
 	$(CP) vgamp.sys $(FLOPPY_DIR)/drivers/vgamp.sys
-endif

 dist: ../../../../$(DIST_DIR)/drivers/vgamp.sys

 ../../../../$(DIST_DIR)/drivers/vgamp.sys: vgamp.sys
-ifeq ($(DOSCLI),yes)
-	$(CP) vgamp.sys ..\..\..\..\$(DIST_DIR)\drivers\vgamp.sys
-else
 	$(CP) vgamp.sys ../../../../$(DIST_DIR)/drivers/vgamp.sys
-endif

 include ../../../../rules.mak

--- a/reactos/drivers/dd/vidport/makefile
+++ b/reactos/drivers/dd/vidport/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.9 2000/08/18 22:27:08 dwelch Exp $
+# $Id: makefile,v 1.10 2000/11/20 19:59:11 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -25,20 +25,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys: $(OBJECTS)
 	$(DLLTOOL) \
--- a/reactos/drivers/fs/minix/makefile_rex
+++ b/reactos/drivers/fs/minix/makefile_rex
@ -1,4 +1,4 @@
-# $Id: makefile_rex,v 1.12 2000/08/11 12:44:24 ekohl Exp $
+# $Id: makefile_rex,v 1.13 2000/11/20 19:59:11 ekohl Exp $
 #
 # Minix IFS Driver makefile
 #
@ -87,20 +87,12 @@ minix.coff: ../../../include/reactos/buildno.h minix.rc
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys

 ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
-endif

 WIN32_LEAN_AND_MEAN = yes
 WARNINGS_ARE_ERRORS = yes
--- a/reactos/drivers/fs/vfat/makefile
+++ b/reactos/drivers/fs/vfat/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.22 2000/10/07 13:41:56 dwelch Exp $
+# $Id: makefile,v 1.23 2000/11/20 19:59:11 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -32,20 +32,12 @@ endif
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).nostrip.sys: $(OBJECTS) $(LIBS)
 	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext -Wl,--base-file,base.tmp -Wl,"-h vfatfs.sys" $(OBJECTS) $(LIBS)
--- a/reactos/drivers/input/keyboard/makefile
+++ b/reactos/drivers/input/keyboard/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2000/10/18 09:09:14 jfilby Exp $
+# $Id: makefile,v 1.2 2000/11/20 19:59:11 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../..
@ -27,20 +27,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys $(TARGET).sys.unstripped: $(OBJECTS)

--- a/reactos/drivers/input/mouclass/makefile
+++ b/reactos/drivers/input/mouclass/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2000/10/25 13:09:05 jfilby Exp $
+# $Id: makefile,v 1.3 2000/11/20 19:59:11 ekohl Exp $
 #
 #
 TARGET = mouclass
@ -26,20 +26,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys: $(OBJECTS)
 	$(CC) \
--- a/reactos/drivers/input/psaux/makefile
+++ b/reactos/drivers/input/psaux/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2000/10/25 13:09:05 jfilby Exp $
+# $Id: makefile,v 1.2 2000/11/20 19:59:12 ekohl Exp $
 #
 #
 TARGET = psaux
@ -26,20 +26,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 $(TARGET).sys: $(OBJECTS)
 	$(CC) \
--- a/reactos/drivers/input/sermouse/makefile
+++ b/reactos/drivers/input/sermouse/makefile
@ -22,20 +22,12 @@ clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys

 ../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 mouse.sys: $(OBJECTS)
 	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
--- a/reactos/drivers/net/dd/ne2000/Makefile
+++ b/reactos/drivers/net/dd/ne2000/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2000/10/08 23:44:46 dwelch Exp $
+# $Id: Makefile,v 1.6 2000/11/20 19:59:12 ekohl Exp $
 #
 #
 PATH_TO_TOP = ../../../..
@ -38,8 +38,6 @@ CLEAN_FILES = \
 		$(TARGETNAME).sys $(TARGETNAME).sym
 endif

-clean:
-
 $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def
 	$(LD) -r $(OBJECTS) -o $(TARGETNAME).o
 	$(DLLTOOL) \
@ -48,12 +46,12 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def
 		--output-lib $(TARGETNAME).a \
 		--kill-at
 	$(CC) \
-        -nostdlib -nostdinc \
+		-nostdlib -nostdinc \
 		--subsystem=native \
 		-mdll \
 		--dll \
 		-e _DriverEntry@8 \
-		-o junk.tmp \
+		-o $(TARGETNAME).sys \
 		-Wl,--image-base,0x10000 \
 		-Wl,--file-alignment,0x1000 \
 		-Wl,--section-alignment,0x1000 \
@ -61,26 +59,30 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def
 		-Wl,--defsym,_edata=__data_end__ \
 		-Wl,--defsym,_etext=etext \
 		-Wl,--base-file,base.tmp \
-        $(TARGETNAME).o \
-        $(IMPORT_LIBS)
+		$(TARGETNAME).o \
+		$(IMPORT_LIBS)
+	- $(RM) base.tmp
+	$(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym
+
+clean:
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) $(TARGET).sys
+	- $(RM) $(TARGETNAME).sys

 .phony: clean

-install: $(FLOPPY_DIR)/drivers/$(TARGET).sys
+install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

-$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
+$(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
+	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

-dist: ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+dist: ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys

-../../../$(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
+../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
+	$(CP) $(TARGETNAME).sys ../../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys

-$(TARGET).sys: $(OBJECTS)
+$(TARGETNAME).sys: $(OBJECTS)

 WITH_DEBUGGING=yes
 include ../../../../rules.mak
--- a/reactos/drivers/net/ndis/Makefile
+++ b/reactos/drivers/net/ndis/Makefile
@ -75,20 +75,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
-endif

 dist: $(DIST_DIR)/drivers/$(TARGETNAME).sys

 $(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
-endif

 #WITH_DEBUGGING      = yes
 #WIN32_LEAN_AND_MEAN = yes
--- a/reactos/drivers/net/tcpip/makefile
+++ b/reactos/drivers/net/tcpip/makefile
@ -113,20 +113,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
-endif

 dist: $(DIST_DIR)/drivers/$(TARGETNAME).sys

 $(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
-endif

 #WITH_DEBUGGING      = yes
 #WIN32_LEAN_AND_MEAN = yes
--- a/reactos/drivers/net/tdi/Makefile
+++ b/reactos/drivers/net/tdi/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2000/10/07 13:41:57 dwelch Exp $
+# $Id: Makefile,v 1.10 2000/11/20 19:59:13 ekohl Exp $
 #
 # TDI.SYS build spec
 #
@ -92,20 +92,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys

 $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys $(FLOPPY_DIR)/drivers/$(TARGETNAME).sys
-endif

 dist: $(DIST_DIR)/drivers/$(TARGETNAME).sys

 $(DIST_DIR)/drivers/$(TARGETNAME).sys: $(TARGETNAME).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).sys ..\..\..\$(DIST_DIR)\drivers\$(TARGETNAME).sys
-else
 	$(CP) $(TARGETNAME).sys ../../../$(DIST_DIR)/drivers/$(TARGETNAME).sys
-endif

 #WITH_DEBUGGING = yes
 #WIN32_LEAN_AND_MEAN = yes
--- a/reactos/drivers/net/wshtcpip/makefile
+++ b/reactos/drivers/net/wshtcpip/makefile
@ -71,20 +71,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll

 $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)\dlls\$(TARGETNAME).dll
-else
 	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll

 $(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGETNAME).dll
-else
-	$(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll
-endif
+	$(CP) $(TARGETNAME).dll ../../../$(DIST_DIR)/dlls/$(TARGETNAME).dll

 include ../../../rules.mak

--- a/reactos/drivers/services/makefile
+++ b/reactos/drivers/services/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2000/08/11 12:46:10 ekohl Exp $
+# $Id: makefile,v 1.3 2000/11/20 19:59:13 ekohl Exp $
 #
 # CSRSS: Client/server runtime subsystem
 #
@ -41,21 +41,13 @@ $(TARGET).exe: $(OBJECTS) $(LIBS)
 install: $(FLOPPY_DIR)/subsys/$(TARGET).exe

 $(FLOPPY_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).exe $(FLOPPY_DIR)\subsys\$(TARGET).exe
-else
 	$(CP) $(TARGET).exe $(FLOPPY_DIR)/subsys/$(TARGET).exe
-endif


 dist: $(DIST_DIR)/subsys/$(TARGET).exe

 $(DIST_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).exe ..\..\$(DIST_DIR)\subsys\$(TARGET).exe
-else
 	$(CP) $(TARGET).exe ../../$(DIST_DIR)/subsys/$(TARGET).exe
-endif


 include ../../rules.mak
--- a/reactos/include/ddk/rtl.h
+++ b/reactos/include/ddk/rtl.h
@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.43 2000/10/08 16:32:51 dwelch Exp $
+/* $Id: rtl.h,v 1.44 2000/11/20 19:59:07 ekohl Exp $
 * 
 */

@ -628,6 +628,14 @@ RtlClearAllBits (
 	IN	PRTL_BITMAP	BitMapHeader
 	);

+VOID
+STDCALL
+RtlClearBits (
+	IN	PRTL_BITMAP	BitMapHeader,
+	IN	ULONG		StartingIndex,
+	IN	ULONG		NumberToClear
+	);
+
 UINT
 STDCALL
 RtlCompactHeap (
--- a/reactos/lib/advapi32/makefile
+++ b/reactos/lib/advapi32/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.15 2000/10/07 13:41:46 dwelch Exp $
+# $Id: makefile,v 1.16 2000/11/20 19:59:08 ekohl Exp $
 #
 # Makefile for ReactOS advapi32.dll
 #
@ -90,15 +90,17 @@ $(CLEAN_FILES:%=%_clean): %_clean:

 .PHONY: clean $(CLEAN_FILES:%=%_clean)

+
 install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll

 $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
 	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll

+
 dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll

 $(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
 	$(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll

-include ../../rules.mak

+include ../../rules.mak
--- a/reactos/lib/crtdll/makefile
+++ b/reactos/lib/crtdll/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.40 2000/10/08 16:32:51 dwelch Exp $
+# $Id: makefile,v 1.41 2000/11/20 19:59:08 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -209,20 +209,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../rules.mak

--- a/reactos/lib/fmifs/makefile
+++ b/reactos/lib/fmifs/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2000/10/07 13:41:47 dwelch Exp $
+# $Id: makefile,v 1.11 2000/11/20 19:59:08 ekohl Exp $
 #
 # Makefile for fmifs.dll
 #
@ -68,20 +68,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../rules.mak

--- a/reactos/lib/gdi32/makefile
+++ b/reactos/lib/gdi32/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.16 2000/10/07 13:41:48 dwelch Exp $
+# $Id: makefile,v 1.17 2000/11/20 19:59:08 ekohl Exp $
 #
 # Makefile for ReactOS gdi32.dll
 #
@ -77,20 +77,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../rules.mak

--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.40 2000/10/07 13:41:48 dwelch Exp $
+# $Id: makefile,v 1.41 2000/11/20 19:59:08 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -136,20 +136,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 WITH_DEBUGGING=yes
 #WARNINGS_ARE_ERRORS = yes
--- a/reactos/lib/msvcrt/Makefile
+++ b/reactos/lib/msvcrt/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000/10/07 13:41:48 dwelch Exp $
+# $Id: Makefile,v 1.5 2000/11/20 19:59:08 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -97,20 +97,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET_NAME).dll

 $(FLOPPY_DIR)/dlls/$(TARGET_NAME).dll: $(TARGET_NAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET_NAME).dll $(FLOPPY_DIR)\dlls\$(TARGET_NAME).dll
-else
 	$(CP) $(TARGET_NAME).dll $(FLOPPY_DIR)/dlls/$(TARGET_NAME).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET_NAME).dll

 $(DIST_DIR)/dlls/$(TARGET_NAME).dll: $(TARGET_NAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET_NAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGET_NAME).dll
-else
 	$(CP) $(TARGET_NAME).dll ../../$(DIST_DIR)/dlls/$(TARGET_NAME).dll
-endif

 include ../../rules.mak

--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.54 2000/10/07 13:41:48 dwelch Exp $
+# $Id: makefile,v 1.55 2000/11/20 19:59:09 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -110,19 +110,11 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../rules.mak
--- a/reactos/lib/psxdll/makefile
+++ b/reactos/lib/psxdll/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.8 2000/08/18 22:27:01 dwelch Exp $
+# $Id: makefile,v 1.9 2000/11/20 19:59:09 ekohl Exp $
 #
 # ReactOS psxdll.dll makefile
 #
@ -106,20 +106,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll

 $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)\dlls\$(TARGETNAME).dll
-else
 	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll

 $(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGETNAME).dll
-else
 	$(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll
-endif

 #WARNINGS_ARE_ERRORS = yes
 include ../../rules.mak
--- a/reactos/lib/rpcrt4/Makefile
+++ b/reactos/lib/rpcrt4/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2000/08/18 22:27:01 dwelch Exp $
+# $Id: Makefile,v 1.4 2000/11/20 19:59:09 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -135,20 +135,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 WARNINGS_ARE_ERRORS = yes
 include ../../rules.mak
--- a/reactos/lib/secur32/Makefile
+++ b/reactos/lib/secur32/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000/10/07 13:41:49 dwelch Exp $
+# $Id: Makefile,v 1.5 2000/11/20 19:59:09 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -18,7 +18,7 @@ OBJECTS = lsa.o dllmain.o $(TARGET).coff

 CLEAN_FILES = $(OBJECTS) \
 	      $(TARGET).o $(TARGET).a junk.tmp base.tmp temp.exp \
-	      $(TARGET).dll $(TARGET).sym $(TARGET).coff
+	      $(TARGET).dll $(TARGET).sym

 $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h

@ -66,5 +66,15 @@ $(CLEAN_FILES:%=%_clean): %_clean:

 .PHONY: clean $(CLEAN_FILES:%=%_clean)

+install: $(FLOPPY_DIR)/dlls/$(TARGET).dll
+
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
+
+dist: $(DIST_DIR)/dlls/$(TARGET).dll
+
+$(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
+	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
+
 include $(PATH_TO_TOP)/rules.mak

--- a/reactos/lib/user32/makefile_rex
+++ b/reactos/lib/user32/makefile_rex
@ -1,4 +1,4 @@
-# $Id: makefile_rex,v 1.13 2000/10/07 13:41:49 dwelch Exp $
+# $Id: makefile_rex,v 1.14 2000/11/20 19:59:09 ekohl Exp $
 #
 # ReactOS Operating System
 #
@ -159,19 +159,11 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 # EOF
--- a/reactos/lib/version/makefile
+++ b/reactos/lib/version/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.5 2000/10/07 13:41:49 dwelch Exp $
+# $Id: makefile,v 1.6 2000/11/20 19:59:09 ekohl Exp $
 #
 # Makefile for ReactOS version.dll
 #
@ -73,20 +73,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGET).dll

 $(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGET).dll

 $(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
-else
 	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
-endif

 include ../../rules.mak

--- a/reactos/lib/ws2_32/makefile
+++ b/reactos/lib/ws2_32/makefile
@ -79,20 +79,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll

 $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)\dlls\$(TARGETNAME).dll
-else
 	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
-endif

 dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll

 $(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGETNAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGETNAME).dll
-else
 	$(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll
-endif

 include ../../rules.mak

--- a/reactos/loaders/dos/makefile
+++ b/reactos/loaders/dos/makefile
@ -1,6 +1,8 @@
+# $Id: makefile,v 1.7 2000/11/20 19:59:10 ekohl Exp $
 #
+# loadros makefile
 #
-#
+PATH_TO_TOP = ../..

 all: loadros.com

@ -15,19 +17,17 @@ clean:
 install: $(FLOPPY_DIR)/loadros.com

 $(FLOPPY_DIR)/loadros.com: loadros.com
-ifeq ($(DOSCLI),yes)
-	$(CP) loadros.com $(FLOPPY_DIR)\loadros.com
-else
 	$(CP) loadros.com $(FLOPPY_DIR)/loadros.com
-endif
+
+.PHONY: install

 dist: ../../$(DIST_DIR)/loadros.com

 ../../$(DIST_DIR)/loadros.com: loadros.com
-ifeq ($(DOSCLI),yes)
-	$(CP) loadros.com ..\..\$(DIST_DIR)\loadros.com
-else
 	$(CP) loadros.com ../../$(DIST_DIR)/loadros.com
-endif
+
+.PHONY: dist
+

 include ../../rules.mak
+#EOF
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@ -35,7 +35,7 @@ NASM_FORMAT = win32
 PREFIX = 
 EXE_POSTFIX = .exe
 #CP = copy /B
-CP = rcopy
+CP = $(PATH_TO_TOP)/rcopy
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
 NASM_CMD = nasm
 RM = del
@ -96,6 +96,7 @@ OBJCOPY = $(PREFIX)objcopy
 	- $(RM) base.tmp
 	$(CC) \
 		--verbose \
+		-Wl,--subsystem,native \
 		-Wl,--image-base,0x10000 \
 		-Wl,-e,_DriverEntry@8 \
 		-Wl,temp.exp \
@ -122,6 +123,7 @@ OBJCOPY = $(PREFIX)objcopy
 	- $(RM) base.tmp
 	$(CC) \
 		--verbose \
+		-Wl,--subsystem,native \
 		-Wl,--image-base,0x10000 \
 		-Wl,-e,_DriverEntry@8 \
 		-Wl,temp.exp \
--- a/reactos/subsys/csrss/makefile
+++ b/reactos/subsys/csrss/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.9 2000/10/07 13:41:57 dwelch Exp $
+# $Id: makefile,v 1.10 2000/11/20 19:59:13 ekohl Exp $
 #
 # CSRSS: Client/server runtime subsystem
 #
@ -51,11 +51,13 @@ install: $(FLOPPY_DIR)/subsys/$(TARGET).exe
 $(FLOPPY_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
 	$(CP) $(TARGET).exe $(FLOPPY_DIR)/subsys/$(TARGET).exe

+
 dist: $(DIST_DIR)/subsys/$(TARGET).exe

 $(DIST_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
 	$(CP) $(TARGET).exe ../../$(DIST_DIR)/subsys/$(TARGET).exe

+
 WITH_DEBUGGING = yes
 include ../../rules.mak

--- a/reactos/subsys/smss/makefile
+++ b/reactos/subsys/smss/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.5 2000/10/07 13:41:57 dwelch Exp $
+# $Id: makefile,v 1.6 2000/11/20 19:59:14 ekohl Exp $
 #
 # Session Manager
 #
@ -43,20 +43,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/subsys/$(TARGET).exe

 $(FLOPPY_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).exe $(FLOPPY_DIR)\subsys\$(TARGET).exe
-else
 	$(CP) $(TARGET).exe $(FLOPPY_DIR)/subsys/$(TARGET).exe
-endif


 dist: $(DIST_DIR)/subsys/$(TARGET).exe

 $(DIST_DIR)/subsys/$(TARGET).exe: $(TARGET).exe
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).exe ..\..\$(DIST_DIR)\subsys\$(TARGET).exe
-else
 	$(CP) $(TARGET).exe ../../$(DIST_DIR)/subsys/$(TARGET).exe
-endif

 include ../../rules.mak
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@ -1,4 +1,4 @@
-# $Id: makefile,v 1.26 2000/10/07 13:41:58 dwelch Exp $
+# $Id: makefile,v 1.27 2000/11/20 19:59:14 ekohl Exp $
 #
 # WIN32K.SYS build spec
 #
@ -105,20 +105,12 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 install: $(FLOPPY_DIR)/drivers/$(TARGET).sys

 $(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys $(FLOPPY_DIR)/drivers/$(TARGET).sys
-endif

 dist: $(DIST_DIR)/drivers/$(TARGET).sys

 $(DIST_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
-ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).sys ..\..\$(DIST_DIR)\drivers\$(TARGET).sys
-else
 	$(CP) $(TARGET).sys ../../$(DIST_DIR)/drivers/$(TARGET).sys
-endif

 #WITH_DEBUGGING = yes
 #WIN32_LEAN_AND_MEAN = yes