From 29f5cf13413f7ac4cfccbf2662ddd3aa174cf12a Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 3 Oct 1999 22:12:24 +0000
Subject: [PATCH] Added floppy and dist targets.

svn path=/trunk/; revision=680
---
 rosapps/Makefile          | 10 ++++++----
 rosapps/sysutils/makefile | 32 +++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/rosapps/Makefile b/rosapps/Makefile
index 1dfe90df33b..03a1c1fbc84 100644
--- a/rosapps/Makefile
+++ b/rosapps/Makefile
@@ -13,8 +13,7 @@ include rules.mak
 #
 # Available applications
 #
-APPS = cmd cmdutils
-# APPS = sysutils notevil
+APPS = cmd cmdutils notevil sysutils
 
 all: $(APPS)
 .PHONY: all
@@ -67,8 +66,9 @@ endif
 
 clean_dist_dir:
 ifeq ($(DOSCLI),yes)
-	$(RM) $(DIST_DIR)\*.*
-	$(RMDIR) $(DIST_DIR)
+#	$(RM) $(DIST_DIR)\apps\*.*
+#	$(RMDIR) $(DIST_DIR)\apps
+#	$(RMDIR) $(DIST_DIR)
 else
 	$(RM) -r $(DIST_DIR)
 endif
@@ -76,8 +76,10 @@ endif
 make_dist_dirs:
 ifeq ($(DOSCLI),yes)
 	mkdir $(DIST_DIR)
+	mkdir $(DIST_DIR)\apps
 else
 	mkdir $(DIST_DIR)
+	mkdir $(DIST_DIR)/apps
 endif
 
 .PHONY: clean_dist_dir make_dist_dirs
diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile
index 8b1ed644bd3..55a2bccd0d8 100644
--- a/rosapps/sysutils/makefile
+++ b/rosapps/sysutils/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 1999/05/16 07:27:35 ea Exp $
+# $Id: makefile,v 1.2 1999/10/03 22:12:07 ekohl Exp $
 #
 # ReactOS System Utilities
 #
@@ -15,10 +15,13 @@
 
 ROSINC=../../reactos/include
 
-all: chkdsk.exe format.exe \
-	chklib.exe shutdown.exe regnav.exe
+TARGET=regnav.exe
+# chkdsk.exe format.exe \
+#        chklib.exe shutdown.exe regnav.exe
 #	login.exe chklib.exe shutdown.exe regnav.exe
 
+all: $(TARGET)
+
 # By Mark Russinovich
 
 chkdsk.exe: chkdsk.o win32err.o wmain.o
@@ -53,8 +56,8 @@ chklib.exe: chklib.o win32err.o
 	$(NM) --numeric-sort chklib.exe > chklib.sym
 
 
-regnav.exe: regnav.o
-	$(CC) regnav.o \
+regnav.exe: regnav.o win32err.o
+	$(CC) regnav.o win32err.o \
 		-o regnav.exe \
 		-lkernel32 \
 		-lcrtdll
@@ -80,6 +83,25 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .phony: clean $(CLEAN_FILES:%=%_clean)
 
+
+floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%)
+
+$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: %
+ifeq ($(DOSCLI),yes)
+	$(CP) $* $(FLOPPY_DIR)\apps\$*
+else
+	$(CP) $* $(FLOPPY_DIR)/apps/$*
+endif
+
+
+dist: $(TARGET:%=../$(DIST_DIR)/apps/%)
+
+$(TARGET:%=../$(DIST_DIR)/apps/%): ../$(DIST_DIR)/apps/%: %
+ifeq ($(DOSCLI),yes)
+	$(CP) $* ..\$(DIST_DIR)\apps\$*
+else
+	$(CP) $* ../$(DIST_DIR)/apps/$*
+endif
 	
 include ../rules.mak