From 0300e2a9d15875e63acfd51d236197620327412f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 21 Oct 1999 16:12:16 +0000
Subject: [PATCH] Fixed floppy and dist targets.

svn path=/trunk/; revision=719
---
 reactos/lib/psxdll/makefile    | 18 +++++++++---------
 reactos/subsys/win32k/makefile | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/psxdll/makefile b/reactos/lib/psxdll/makefile
index 7a8f192897f..7a4aa859c79 100644
--- a/reactos/lib/psxdll/makefile
+++ b/reactos/lib/psxdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 1999/10/12 21:17:04 ea Exp $
+# $Id: makefile,v 1.3 1999/10/21 16:11:42 ekohl Exp $
 #
 # ReactOS psxdll.dll makefile
 #
@@ -90,22 +90,22 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
-floppy: $(FLOPPY_DIR)/dlls/$(TARGET).dll
+floppy: $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
 
-$(FLOPPY_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
+$(FLOPPY_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)\dlls\$(TARGET).dll
+	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)\dlls\$(TARGETNAME).dll
 else
-	$(CP) $(TARGET).dll $(FLOPPY_DIR)/dlls/$(TARGET).dll
+	$(CP) $(TARGETNAME).dll $(FLOPPY_DIR)/dlls/$(TARGETNAME).dll
 endif
 
-dist: $(DIST_DIR)/dlls/$(TARGET).dll
+dist: $(DIST_DIR)/dlls/$(TARGETNAME).dll
 
-$(DIST_DIR)/dlls/$(TARGET).dll: $(TARGET).dll
+$(DIST_DIR)/dlls/$(TARGETNAME).dll: $(TARGETNAME).dll
 ifeq ($(DOSCLI),yes)
-	$(CP) $(TARGET).dll ..\..\$(DIST_DIR)\dlls\$(TARGET).dll
+	$(CP) $(TARGETNAME).dll ..\..\$(DIST_DIR)\dlls\$(TARGETNAME).dll
 else
-	$(CP) $(TARGET).dll ../../$(DIST_DIR)/dlls/$(TARGET).dll
+	$(CP) $(TARGETNAME).dll ../../$(DIST_DIR)/dlls/$(TARGETNAME).dll
 endif
 
 #WARNINGS_ARE_ERRORS = yes
diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index e1afd85a5da..0f1b7a5cb38 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -18,6 +18,8 @@ STUBS_OBJECTS = stubs/stubs.o
 OBJECTS = $(MAIN_OBJECTS) $(MISC_OBJECTS) $(OBJECTS_OBJECTS)  \
           $(RESOURCE_OBJECT) $(STUBS_OBJECTS) 
 
+TARGET=win32k.sys
+
 all: win32k.sys
 
 win32k.coff: win32k.rc ../../include/reactos/resource.h
@@ -66,6 +68,26 @@ $(CLEAN_FILES:%=%_clean): %_clean:
 
 .PHONY: clean $(CLEAN_FILES:%=%_clean)
 
+floppy: $(FLOPPY_DIR)/subsys/win32k.sys
+
+$(FLOPPY_DIR)/subsys/$(TARGET).sys: $(TARGET).sys
+ifeq ($(DOSCLI),yes)
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)\subsys\$(TARGET).sys
+else
+	$(CP) $(TARGET).sys $(FLOPPY_DIR)/subsys/$(TARGET).sys
+endif
+
+
+dist: $(DIST_DIR)/subsys/$(TARGET).sys
+
+$(DIST_DIR)/subsys/$(TARGET).sys: $(TARGET).sys
+ifeq ($(DOSCLI),yes)
+	$(CP) $(TARGET).sys ..\..\$(DIST_DIR)\subsys\$(TARGET).sys
+else
+	$(CP) $(TARGET).sys ../../$(DIST_DIR)/subsys/$(TARGET).sys
+endif
+
+
 #WITH_DEBUGGING = yes
 WIN32_LEAN_AND_MEAN = yes
 #WARNINGS_ARE_ERRORS = yes