From 0ce702e83fe07a5ed337e34f376531d62396095b Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 25 Feb 2005 20:00:27 +0000
Subject: [PATCH] fixed 'make all' and added some missing clean:: rules

svn path=/branches/xmlbuildsystem/; revision=13743
---
 reactos/Makefile              | 7 ++++++-
 reactos/tools/Makefile        | 6 ++++++
 reactos/tools/nci/makefile    | 6 ++++++
 reactos/tools/rbuild/makefile | 3 +++
 reactos/tools/wmc/makefile    | 3 +++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index 5bc7919ca7f..bc4cdcdf182 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -4,15 +4,17 @@ ifeq ($(HOST),mingw32-linux)
 	host_gcc = gcc
 	host_gpp = g++
 	nmkdir = mkdir -p
+	rm = rm
 else # mingw32-windows
 	EXEPOSTFIX = .exe
 	SEP = \$(EMPTY_VAR)
 	host_gcc = gcc
 	host_gpp = g++
 	nmkdir = mkdir
+	rm = del /f /q
 endif
 
-default: Makefile.auto
+all: Makefile.auto
 
 ifneq ($(ROS_INTERMEDIATE),)
 $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE)
@@ -46,3 +48,6 @@ include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) nt
 
 include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc
 	$(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc
+
+clean::
+	-@$(rm) Makefile.auto $(PREAUTO)
diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index 956cb1ee1d4..dcc935a9b5a 100644
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -19,6 +19,9 @@ $(RMKDIR_TARGET): $(RMKDIR_OBJECTS)
 $(RMKDIR_OBJECTS): %.o : %.c
 	${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@
 
+clean::
+	-@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL)
+
 
 
 BUILDNO_BASE = tools
@@ -42,6 +45,9 @@ $(BUILDNO_TARGET): $(BUILDNO_OBJECTS)
 $(BUILDNO_OBJECTS): %.o : %.c
 	${host_gcc} $(BUILDNO_HOST_CFLAGS) -c $< -o $@
 
+clean::
+	-@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL)
+
 include$(SEP)reactos$(SEP)buildno.h: $(BUILDNO_TARGET)
 	$(EXEPREFIX)$(BUILDNO_TARGET) include$(SEP)reactos$(SEP)buildno.h
 
diff --git a/reactos/tools/nci/makefile b/reactos/tools/nci/makefile
index 9f0123fc7ca..f284c3eb9d9 100644
--- a/reactos/tools/nci/makefile
+++ b/reactos/tools/nci/makefile
@@ -19,6 +19,9 @@ $(NCI_TARGET): $(NCI_OBJECTS)
 $(NCI_OBJECTS): %.o : %.c
 	${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@
 
+clean::
+	-@$(rm) $(NCI_TARGET) $(NCI_OBJECTS) 2>$(NUL)
+
 # WIN32K.SYS
 WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db
 WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)main$(SEP)svctab.c
@@ -49,3 +52,6 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET)
 		$(KERNEL_STUBS) \
 		$(WIN32K_GDI_STUBS) \
 		$(WIN32K_USER_STUBS)
+
+clean::
+	-@$(rm) $(NCI_SERVICE_FILES) 2>$(NUL)
diff --git a/reactos/tools/rbuild/makefile b/reactos/tools/rbuild/makefile
index 222c7860449..3dedb3c7baa 100644
--- a/reactos/tools/rbuild/makefile
+++ b/reactos/tools/rbuild/makefile
@@ -100,3 +100,6 @@ $(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp
 
 rbuild_test: $(RBUILD_TEST_TARGET)
 	$(RBUILD_TEST_TARGET)
+
+clean::
+	-@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_OBJECTS) 2>$(NUL)
diff --git a/reactos/tools/wmc/makefile b/reactos/tools/wmc/makefile
index 679562a6338..ef6c2e5e64a 100644
--- a/reactos/tools/wmc/makefile
+++ b/reactos/tools/wmc/makefile
@@ -25,3 +25,6 @@ $(WMC_TARGET): $(WMC_OBJECTS)
 
 $(WMC_OBJECTS): %.o : %.c
 	${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@
+
+clean::
+	-@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL)
-- 
2.17.1