From 04f2911330601fc22e25b27f0425b6829fcd3ed3 Mon Sep 17 00:00:00 2001
From: Rex Jolliff <rex@lvcablemodem.com>
Date: Fri, 16 Jul 1999 23:37:07 +0000
Subject: [PATCH] added dist rule

svn path=/trunk/; revision=593
---
 reactos/apps/tests/args/makefile     | 20 +++++++++++++++-----
 reactos/apps/tests/bench/makefile    | 23 +++++++++++++++--------
 reactos/apps/tests/hello/makefile    | 18 ++++++++++++++----
 reactos/apps/tests/test_old/makefile | 25 ++++++++++++++++---------
 reactos/apps/utils/cat/makefile      | 20 ++++++++++++++++----
 reactos/apps/utils/shell/makefile    | 18 ++++++++++++++----
 reactos/doc/todo                     |  9 +++++++++
 reactos/drivers/dd/blue/makefile     | 18 ++++++++++++++----
 reactos/drivers/dd/ide/makefile      | 18 ++++++++++++++----
 reactos/drivers/dd/keyboard/makefile | 18 ++++++++++++++----
 reactos/drivers/dd/mouse/makefile    | 18 ++++++++++++++----
 reactos/drivers/dd/null/makefile     | 18 ++++++++++++++----
 reactos/drivers/dd/parallel/makefile | 18 ++++++++++++++----
 reactos/drivers/dd/serial/makefile   | 18 ++++++++++++++----
 reactos/drivers/dd/vidport/makefile  | 18 ++++++++++++++----
 reactos/drivers/fs/vfat/makefile     | 18 ++++++++++++++----
 reactos/lib/crtdll/makefile          | 18 +++++++++++++-----
 reactos/lib/fmifs/makefile           | 19 ++++++++++++++-----
 reactos/lib/gdi32/makefile           | 19 ++++++++++++++-----
 reactos/lib/kernel32/makefile        | 19 ++++++++++++++-----
 reactos/lib/ntdll/makefile           | 19 ++++++++++++++-----
 reactos/loaders/dos/makefile         |  8 ++++++++
 reactos/makefile_rex                 | 12 ++++++------
 reactos/ntoskrnl/makefile_rex        | 23 ++++++++++++++++++-----
 reactos/rules.mak                    |  6 ++++--
 25 files changed, 330 insertions(+), 108 deletions(-)

diff --git a/reactos/apps/tests/args/makefile b/reactos/apps/tests/args/makefile
index f14db143fc4..e9e2296ee32 100644
--- a/reactos/apps/tests/args/makefile
+++ b/reactos/apps/tests/args/makefile
@@ -2,8 +2,9 @@
 #
 #
 OBJECTS= args.o
+PROGS= args.exe
 
-all: args.exe
+all: $(PROGS)
 
 .phony: all
 
@@ -14,13 +15,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/apps/args.exe
+floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
 
-$(FLOPPY_DIR)/apps/args.exe: args.exe
+$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
 ifeq ($(DOSCLI),yes)
-	$(CP) args.exe $(FLOPPY_DIR)\apps\args.exe
+	$(CP) $* $(FLOPPY_DIR)\apps\$*
 else
-	$(CP) args.exe $(FLOPPY_DIR)/apps\args.exe
+	$(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) $(LIBS)
diff --git a/reactos/apps/tests/bench/makefile b/reactos/apps/tests/bench/makefile
index 104f8e61990..d71c4d0347d 100644
--- a/reactos/apps/tests/bench/makefile
+++ b/reactos/apps/tests/bench/makefile
@@ -1,32 +1,39 @@
 #
 #
 #
-BENCH_PROGS = bench-thread
+PROGS = bench-thread
 
-all: $(BENCH_PROGS:%=%.exe)
+all: $(PROGS:%=%.exe)
 
 .phony: all
 
-clean: $(BENCH_PROGS:%=%_clean)
+clean: $(PROGS:%=%_clean)
 
-$(BENCH_PROGS:%=%_clean): %_clean:
+$(PROGS:%=%_clean): %_clean:
 	- $(RM) $*.o
 	- $(RM) $*.exe
 	- $(RM) $*.sym
 
 .phony: clean
 
-floppy: # $(BENCH_PROGS:%=%_floppy)
+floppy: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)
 
-$(BENCH_PROGS:%=%_floppy): %_floppy: $(FLOPPY_DIR)/apps/%.exe
-
-$(BENCH_PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.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) bench-thread.c -lkernel32 -o bench-thread.exe
 	$(NM) --numeric-sort bench-thread.exe > bench-thread.sym
diff --git a/reactos/apps/tests/hello/makefile b/reactos/apps/tests/hello/makefile
index 65c2d88b496..8663eb75ab5 100644
--- a/reactos/apps/tests/hello/makefile
+++ b/reactos/apps/tests/hello/makefile
@@ -2,6 +2,7 @@
 #
 #
 OBJECTS = ../common/crt0.o hello.o
+PROGS = hello.exe
 LIBS = ../../lib/kernel32/kernel32.a ../../lib/ntdll/ntdll.a
 CLEAN_FILES = hello.o hello.exe
 
@@ -14,13 +15,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .phony: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/apps/hello.exe
+floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
 
-$(FLOPPY_DIR)/apps/hello.exe: hello.exe
+$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
 ifeq ($(DOSCLI),yes)
-	$(CP) hello.exe $(FLOPPY_DIR)\apps\hello.exe
+	$(CP) $* $(FLOPPY_DIR)\apps\$*
 else
-	$(CP) hello.exe $(FLOPPY_DIR)/apps\hello.exe
+	$(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) $(LIBS)
diff --git a/reactos/apps/tests/test_old/makefile b/reactos/apps/tests/test_old/makefile
index bfd7289af85..239fe08f94a 100644
--- a/reactos/apps/tests/test_old/makefile
+++ b/reactos/apps/tests/test_old/makefile
@@ -1,33 +1,40 @@
 #
 #
 #
-TEST_PROGS= test-stdio tst-printf tstdiomisc bug2 bug3 \
-            temptest test-fseek test_rdwr
+PROGS= test-stdio tst-printf tstdiomisc bug2 bug3 \
+       temptest test-fseek test_rdwr
 
-all: $(TEST_PROGS:%=%.exe)
+all: $(PROGS:%=%.exe)
 
 .phony: all
 
-$(TEST_PROGS:%=%_clean): %_clean:
+$(PROGS:%=%_clean): %_clean:
 	- $(RM) $*.o
 	- $(RM) $*.exe
 	- $(RM) $*.sym
 
-clean: $(TEST_PROGS:%=%_clean)
+clean: $(PROGS:%=%_clean)
 
 .phony: clean
 
-floppy: # $(TEST_PROGS:%=%_floppy)
+floppy: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)
 
-$(TEST_PROGS:%=%_floppy): %_floppy: $(FLOPPY_DIR)/apps/%.exe
-
-$(TEST_PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.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
 	$(NM) --numeric-sort bug2.exe > bug2.sym
diff --git a/reactos/apps/utils/cat/makefile b/reactos/apps/utils/cat/makefile
index a9e8917bc8c..9447417abfe 100644
--- a/reactos/apps/utils/cat/makefile
+++ b/reactos/apps/utils/cat/makefile
@@ -2,6 +2,7 @@
 #
 #
 OBJECTS= cat.o
+PROGS= cat.exe
 
 all: cat.exe
 
@@ -14,15 +15,26 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/apps/cat.exe
+floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
 
-$(FLOPPY_DIR)/apps/cat.exe: cat.exe
+$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
 ifeq ($(DOSCLI),yes)
-	$(CP) cat.exe $(FLOPPY_DIR)\apps\cat.exe
+	$(CP) $* $(FLOPPY_DIR)\apps\$*
 else
-	$(CP) cat.exe $(FLOPPY_DIR)/apps/cat.exe
+	$(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
+
 cat.exe: $(OBJECTS) $(LIBS)
 	$(CC) $(OBJECTS) -o cat.exe
 	$(NM) --numeric-sort cat.exe > args.sym
diff --git a/reactos/apps/utils/shell/makefile b/reactos/apps/utils/shell/makefile
index cd81416d717..866f24eff6f 100644
--- a/reactos/apps/utils/shell/makefile
+++ b/reactos/apps/utils/shell/makefile
@@ -2,6 +2,7 @@
 #
 #
 OBJECTS= ../common/crt0.o shell.o
+PROGS= shell.exe
 LIBS= ../../lib/kernel32/kernel32.a ../../lib/ntdll/ntdll.a
 CLEAN_FILES= shell.o shell.exe shell.sym
 
@@ -14,13 +15,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .phony: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/apps/shell.exe
+floppy: $(PROGS:%=$(FLOPPY_DIR)/apps/%)
 
-$(FLOPPY_DIR)/apps/shell.exe: shell.exe
+$(PROGS:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
 ifeq ($(DOSCLI),yes)
-	$(CP) shell.exe $(FLOPPY_DIR)\apps\shell.exe
+	$(CP) $* $(FLOPPY_DIR)\apps\$*
 else
-	$(CP) shell.exe $(FLOPPY_DIR)/apps/shell.exe
+	$(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)
diff --git a/reactos/doc/todo b/reactos/doc/todo
index 3d03a21d568..360601c5978 100644
--- a/reactos/doc/todo
+++ b/reactos/doc/todo
@@ -1,3 +1,12 @@
+
+* Critical path tasks
+       Test and debug Registry routines
+       Finish multiple system service table support (HalRegisterServiceTable)
+       Modify GENNTDLL to generate all needed system service tables
+
+* These tasks would be nice
+       Separate HAL into KM DLL
+
 * Function groups totally or partially unimplemented
 
        Dma functions (see hal/x86/dma.c)
diff --git a/reactos/drivers/dd/blue/makefile b/reactos/drivers/dd/blue/makefile
index 1da166e1fb3..38613a10850 100644
--- a/reactos/drivers/dd/blue/makefile
+++ b/reactos/drivers/dd/blue/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET = blue
 
 OBJECTS = blue.o ../../../ntoskrnl/ntoskrnl.a
 
@@ -17,13 +18,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/blue.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/blue.sys: blue.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) blue.sys $(FLOPPY_DIR)\drivers\blue.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) blue.sys $(FLOPPY_DIR)/drviers/blue.sys
+	$(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
 
 blue.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/ide/makefile b/reactos/drivers/dd/ide/makefile
index d6d0bee71bf..63d07a50a10 100644
--- a/reactos/drivers/dd/ide/makefile
+++ b/reactos/drivers/dd/ide/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=ide
 OBJECTS = ide.o ../../../ntoskrnl/ntoskrnl.a
 
 all: ide.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/ide.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/ide.sys: ide.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) ide.sys $(FLOPPY_DIR)\ide.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) ide.sys $(FLOPPY_DIR)/ide.sys
+	$(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
 
 ide.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/keyboard/makefile b/reactos/drivers/dd/keyboard/makefile
index f7c0f8f97be..1403001fb40 100644
--- a/reactos/drivers/dd/keyboard/makefile
+++ b/reactos/drivers/dd/keyboard/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=keyboard
 OBJECTS = keyboard.o ../../../ntoskrnl/ntoskrnl.a
 
 all: keyboard.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/keyboard.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/keyboard.sys: keyboard.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) keyboard.sys $(FLOPPY_DIR)\drivers\keyboard.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) keyboard.sys $(FLOPPY_DIR)/drviers/keyboard.sys
+	$(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
 
 keyboard.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/mouse/makefile b/reactos/drivers/dd/mouse/makefile
index cfd25769f7f..3edc43d5365 100644
--- a/reactos/drivers/dd/mouse/makefile
+++ b/reactos/drivers/dd/mouse/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=mouse
 OBJECTS= mouse.o ../../../ntoskrnl/ntoskrnl.a
 
 all: mouse.o
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: # $(FLOPPY_DIR)/drivers/mouse.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/mouse.sys: mouse.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) mouse.sys $(FLOPPY_DIR)\drivers\mouse.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) mouse.sys $(FLOPPY_DIR)/drviers/mouse.sys
+	$(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)
diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile
index f25a684e9a1..f2f78b1cbd5 100644
--- a/reactos/drivers/dd/null/makefile
+++ b/reactos/drivers/dd/null/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=null
 OBJECTS= null.o ../../../ntoskrnl/ntoskrnl.a
 
 all: null.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/null.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/null.sys: null.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) null.sys $(FLOPPY_DIR)\drivers\null.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) null.sys $(FLOPPY_DIR)/drviers/null.sys
+	$(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
 
 null.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/parallel/makefile b/reactos/drivers/dd/parallel/makefile
index 7f77c28df8c..218eae3891e 100644
--- a/reactos/drivers/dd/parallel/makefile
+++ b/reactos/drivers/dd/parallel/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=parallel
 OBJECTS= parallel.o ../../../ntoskrnl/ntoskrnl.a
 
 all: parallel.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/parallel.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/parallel.sys: parallel.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) parallel.sys $(FLOPPY_DIR)\drivers\parallel.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) parallel.sys $(FLOPPY_DIR)/drviers/parallel.sys
+	$(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
 
 parallel.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/serial/makefile b/reactos/drivers/dd/serial/makefile
index e0c38b27e1c..24276b650ad 100644
--- a/reactos/drivers/dd/serial/makefile
+++ b/reactos/drivers/dd/serial/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET= serial
 OBJECTS= serial.o ../../../ntoskrnl/ntoskrnl.a
 
 all: serial.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/serial.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/serial.sys: serial.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) serial.sys $(FLOPPY_DIR)\drivers\serial.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) serial.sys $(FLOPPY_DIR)/drviers/serial.sys
+	$(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
 
 serial.sys: $(OBJECTS)
diff --git a/reactos/drivers/dd/vidport/makefile b/reactos/drivers/dd/vidport/makefile
index f4d4e3651b7..a6e5f77e6eb 100644
--- a/reactos/drivers/dd/vidport/makefile
+++ b/reactos/drivers/dd/vidport/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=vidport
 OBJECTS = vidport.o ../../../ntoskrnl/ntoskrnl.a
 
 all: vidport.sys
@@ -16,13 +17,22 @@ clean:
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/vidport.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/vidport.sys: vidport.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) vidport.sys $(FLOPPY_DIR)\drivers\vidport.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) vidport.sys $(FLOPPY_DIR)/drviers/vidport.sys
+	$(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
 
 vidport.sys: $(OBJECTS)
diff --git a/reactos/drivers/fs/vfat/makefile b/reactos/drivers/fs/vfat/makefile
index 2287a7f0860..1c288fbd5dd 100644
--- a/reactos/drivers/fs/vfat/makefile
+++ b/reactos/drivers/fs/vfat/makefile
@@ -1,6 +1,7 @@
 #
 #
 #
+TARGET=vfatfsd
 OBJECTS = blockdev.o dir.o dirwr.o iface.o ../../../ntoskrnl/ntoskrnl.a
 
 all: vfatfsd.sys
@@ -23,13 +24,22 @@ endif
 
 .phony: clean
 
-floppy: $(FLOPPY_DIR)/drivers/vfatfsd.sys
+floppy: $(FLOPPY_DIR)/drivers/$(TARGET).sys
 
-$(FLOPPY_DIR)/drivers/vfatfsd.sys: vfatfsd.sys
+$(FLOPPY_DIR)/drivers/$(TARGET).sys: $(TARGET).sys
 ifeq ($(DOSCLI),yes)
-	$(CP) vfatfsd.sys $(FLOPPY_DIR)\vfatfsd.sys
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\drivers\$(TARGET).sys
 else
-	$(CP) vfatfsd.sys $(FLOPPY_DIR)/vfatfsd.sys
+	$(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
 
 vfatfsd.sys: $(OBJECTS)
diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile
index 1ddf50dab53..c575d5e96e3 100644
--- a/reactos/lib/crtdll/makefile
+++ b/reactos/lib/crtdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.31 1999/06/25 04:35:45 rex Exp $
+# $Id: makefile,v 1.32 1999/07/16 23:37:04 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -207,15 +207,23 @@ clean: $(CLEAN_FILES:%=%_clean)
 $(CLEAN_FILES:%=%_clean): %_clean:
 	- $(RM) $*
 
-floppy: $(FLOPPY_DIR)/dlls/crtdll.dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
 
-$(FLOPPY_DIR)/dlls/crtdll.dll: crtdll.dll
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) crtdll.dll $(FLOPPY_DIR)\dlls\crtdll.dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
 else
-	$(CP) crtdll.dll $(FLOPPY_DIR)/dlls/crtdll.dll
+	$(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
 
diff --git a/reactos/lib/fmifs/makefile b/reactos/lib/fmifs/makefile
index 855c27dfdf4..16171b41c9b 100644
--- a/reactos/lib/fmifs/makefile
+++ b/reactos/lib/fmifs/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.4 1999/06/25 04:35:47 rex Exp $
+# $Id: makefile,v 1.5 1999/07/16 23:37:04 rex Exp $
 #
 # Makefile for fmifs.dll
 #
@@ -71,13 +71,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/dlls/fmifs.dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
 
-$(FLOPPY_DIR)/dlls/fmifs.dll: fmifs.dll
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) fmifs.dll $(FLOPPY_DIR)\dlls\fmifs.dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
 else
-	$(CP) fmifs.dll $(FLOPPY_DIR)/dlls/fmifs.dll
+	$(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
diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile
index 654c8978752..632eebf8fe4 100644
--- a/reactos/lib/gdi32/makefile
+++ b/reactos/lib/gdi32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.5 1999/06/25 04:35:49 rex Exp $
+# $Id: makefile,v 1.6 1999/07/16 23:37:04 rex Exp $
 #
 # Makefile for ReactOS gdi32.dll
 #
@@ -73,13 +73,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/dlls/gdi32.dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
 
-$(FLOPPY_DIR)/dlls/gdi32.dll: gdi32.dll
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) gdi32.dll $(FLOPPY_DIR)\dlls\gdi32.dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
 else
-	$(CP) gdi32.dll $(FLOPPY_DIR)/dlls/gdi32.dll
+	$(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
diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile
index 88d0f8f82fd..e9269d0eaee 100644
--- a/reactos/lib/kernel32/makefile
+++ b/reactos/lib/kernel32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.21 1999/06/25 04:35:49 rex Exp $
+# $Id: makefile,v 1.22 1999/07/16 23:37:04 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -134,13 +134,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/dlls/kernel32.dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
 
-$(FLOPPY_DIR)/dlls/kernel32.dll: kernel32.dll
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) kernel32.dll $(FLOPPY_DIR)\dlls\kernel32.dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
 else
-	$(CP) kernel32.dll $(FLOPPY_DIR)/dlls/kernel32.dll
+	$(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
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 66c473b2bce..4520ac1b24b 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.17 1999/06/25 04:35:50 rex Exp $
+# $Id: makefile,v 1.18 1999/07/16 23:37:04 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -98,13 +98,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/dlls/ntdll.dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
 
-$(FLOPPY_DIR)/dlls/ntdll.dll: ntdll.dll
+$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) ntdll.dll $(FLOPPY_DIR)\dlls\ntdll.dll
+	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
 else
-	$(CP) ntdll.dll $(FLOPPY_DIR)/dlls/ntdll.dll
+	$(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
diff --git a/reactos/loaders/dos/makefile b/reactos/loaders/dos/makefile
index b88d6d09e2e..3f27f2ccff4 100644
--- a/reactos/loaders/dos/makefile
+++ b/reactos/loaders/dos/makefile
@@ -21,5 +21,13 @@ else
 	$(CP) loadros.com $(FLOPPY_DIR)/loadros.com
 endif
 
+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
 
 include ../../rules.mak
diff --git a/reactos/makefile_rex b/reactos/makefile_rex
index f07b49253e6..33fc52c32d3 100644
--- a/reactos/makefile_rex
+++ b/reactos/makefile_rex
@@ -17,7 +17,7 @@ include rules.mak
 COMPONENTS = iface_native ntoskrnl
 DLLS = ntdll kernel32 crtdll fmifs gdi32
 #DLLS = advapi32 mingw32 user32
-SUBSYS = # win32k
+#SUBSYS = win32k
 
 #
 # Select the server(s) you want to build
@@ -34,8 +34,8 @@ LOADERS = dos
 #
 # Select the device drivers and filesystems you want
 #
-DEVICE_DRIVERS = blue ide keyboard mouse null parallel serial vidport
-# DEVICE_DRIVERS = beep event floppy ide_test sound test test1
+DEVICE_DRIVERS = blue ide keyboard null parallel serial vidport
+# DEVICE_DRIVERS = beep event floppy ide_test mouse sound test test1
 FS_DRIVERS = vfat
 # FS_DRIVERS = minix ext2 template
 KERNEL_SERVICES = $(DEVICE_DRIVERS) $(FS_DRIVERS)
@@ -54,7 +54,7 @@ floppy: make_floppy_dirs autoexec_floppy $(COMPONENTS:%=%_floppy) \
         $(DLLS:%=%_floppy) $(LOADERS:%=%_floppy) \
         $(KERNEL_SERVICES:%=%_floppy) $(APPS:%=%_floppy)
 
-dist: clean_dist_dir $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
+dist: clean_dist_dir make_dist_dirs $(COMPONENTS:%=%_dist) $(DLLS:%=%_dist) \
       $(LOADERS:%=%_dist) $(KERNEL_SERVICES:%=%_dist) $(APPS:%=%_dist)
 
 #
@@ -224,7 +224,7 @@ endif
 # Make a distribution saveset
 #
 
-clean_dist_dirs:
+clean_dist_dir:
 ifeq ($(DOSCLI),yes)
 	$(RM) $(DIST_DIR)\dlls\*.*
 	$(RM) $(DIST_DIR)\apps\*.*
@@ -247,7 +247,7 @@ else
 	mkdir $(DIST_DIR) $(DIST_DIR)/dlls $(DIST_DIR)/apps $(DIST_DIR)/drivers
 endif
 
-.PHONY: clean_dist_dirs make_dist_dirs
+.PHONY: clean_dist_dir make_dist_dirs
 
 
 
diff --git a/reactos/ntoskrnl/makefile_rex b/reactos/ntoskrnl/makefile_rex
index a146854ec71..a179e253389 100644
--- a/reactos/ntoskrnl/makefile_rex
+++ b/reactos/ntoskrnl/makefile_rex
@@ -1,4 +1,4 @@
-# $Id: makefile_rex,v 1.26 1999/06/25 04:35:52 rex Exp $
+# $Id: makefile_rex,v 1.27 1999/07/16 23:37:05 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -185,15 +185,28 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/ntoskrnl.exe
+floppy: $(FLOPPY_DIR)/$(TARGET).exe
 
-$(FLOPPY_DIR)/ntoskrnl.exe: ntoskrnl.exe
+$(FLOPPY_DIR)/$(TARGET).exe: $(TARGET).exe
 ifeq ($(DOSCLI),yes)
-	$(CP) ntoskrnl.exe $(FLOPPY_DIR)\ntoskrnl.exe
+	$(CP) $(TARGET).exe $(FLOPPY_DIR)\$(TARGET).exe
 else
-	$(CP) ntoskrnl.exe $(FLOPPY_DIR)/ntoskrnl.exe
+	$(CP) $(TARGET).exe $(FLOPPY_DIR)/$(TARGET).exe
 endif
 
+.PHONY: dist
+
+dist: ../$(DIST_DIR)/$(TARGET).exe
+
+../$(DIST_DIR)/$(TARGET).exe: $(TARGET).exe
+ifeq ($(DOSCLI),yes)
+	$(CP) $(TARGET).exe ..\$(DIST_DIR)\$(TARGET).exe
+else
+	$(CP) $(TARGET).exe ../$(DIST_DIR)/$(TARGET).exe
+endif
+
+.PHONY: dist
+
 ex/napi.o: ex/napi.c ../include/ntdll/napi.h
 
 #WITH_DEBUGGING = yes
diff --git a/reactos/rules.mak b/reactos/rules.mak
index 86dc624a73a..f35db51ce97 100644
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -19,7 +19,8 @@ DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
 NASM_CMD = nasm
 KM_SPECS = $(TOPDIR)/specs
 FLOPPY_DIR = /a
-DIST_DIR = $(TOPDIR)/dist
+# DIST_DIR should be relative from the top of the tree
+DIST_DIR = dist
 endif
 
 ifeq ($(HOST),mingw32-windows)
@@ -33,7 +34,8 @@ RM = del
 KM_SPECS = specs
 DOSCLI = yes
 FLOPPY_DIR = A:
-DIST_DIR = $(TEMP)\dist
+# DIST_DIR should be relative from the top of the tree
+DIST_DIR = dist
 endif
 
 #
-- 
2.17.1