From 5ce255ed4c54ab88583d6d3b7b83677625949f81 Mon Sep 17 00:00:00 2001
From: Rex Jolliff <rex@lvcablemodem.com>
Date: Sun, 15 Jul 2001 18:06:23 +0000
Subject: [PATCH] some work on clean rule

svn path=/trunk/; revision=2063
---
 reactos/iface/addsys/makefile | 24 ++++++++++--------------
 reactos/ntoskrnl/Makefile     |  5 +++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/reactos/iface/addsys/makefile b/reactos/iface/addsys/makefile
index 47d731a9be0..ad83f501dbc 100644
--- a/reactos/iface/addsys/makefile
+++ b/reactos/iface/addsys/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.8 2000/10/07 13:41:45 dwelch Exp $
+# $Id: makefile,v 1.9 2001/07/15 18:06:23 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -14,19 +14,15 @@ SVC_DB=w32ksvc.db
 SVC_MASK=0x1000
 
 # DOS and Win32 kernels handle Unix paths too.
-#ifeq ($(DOSCLI),yes)
-#SVC_SERVICE_TABLE_PATH=..\..\subsys\win32k\main
-#SVC_GDI_STUBS_PATH=..\..\lib\gdi32\misc
-#SVC_USER_STUBS_PATH=..\..\lib\user32\misc
-#else
-SVC_SERVICE_TABLE_PATH=../../subsys/win32k/main
-SVC_GDI_STUBS_PATH=../../lib/gdi32/misc
-SVC_USER_STUBS_PATH=../../lib/user32/misc
-#endif
-
-SVC_SERVICE_TABLE=$(SVC_SERVICE_TABLE_PATH)/svctab.c
-SVC_GDI_STUBS=$(SVC_GDI_STUBS_PATH)/win32k.c
-SVC_USER_STUBS=$(SVC_USER_STUBS_PATH)/win32k.c
+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)
 
diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index f7892750bb2..ed0b96cccee 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.46 2001/07/12 17:17:06 ekohl Exp $
+# $Id: Makefile,v 1.47 2001/07/15 18:06:23 rex Exp $
 #
 # ReactOS Operating System
 #
@@ -495,7 +495,8 @@ CLEAN_FILES = $(OBJECTS_PATH)\*.o cc\*.o cm\*.o dbg\*.o dbg\i386\*.o ex\*.o hal\
               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)
+              $(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 \