From: Royce Mitchell III <royce3@ev1.net>
Date: Mon, 14 Mar 2005 19:11:03 +0000 (+0000)
Subject: echo [WMC] commands
X-Git-Tag: backups/xmlbuildsystem@15601~157
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=e7018c40096a5f76e0dde2a8a39018a557b2a3c2

echo [WMC] commands
remove some unnecessary indirect dependencies
have rbuild mkdir commands depend directly on RMKDIR_TARGET
don't have object files depend on themselves!
add rmkdir, rsym, and wmc phony targets

svn path=/branches/xmlbuildsystem/; revision=14067
---

diff --git a/reactos/Makefile b/reactos/Makefile
index f32aaff14ce..dc8e8cf7f93 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -53,6 +53,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_LD     =@echo [LD]      $@
   ECHO_RBUILD =@echo [RBUILD]  $@
   ECHO_RSYM   =@echo [RSYM]    $@
+  ECHO_WMC    =@echo [WMC]     $@
   ECHO_NCI    =@echo [NCI]     $@
   ECHO_CABMAN =@echo [CABMAN]  $<
   ECHO_CDMAKE =@echo [CDMAKE]  $@
@@ -71,6 +72,7 @@ else
   ECHO_LD     =
   ECHO_RBUILD =
   ECHO_RSYM   =
+  ECHO_WMC    =
   ECHO_NCI    =
   ECHO_CABMAN =
   ECHO_CDMAKE =
@@ -156,16 +158,18 @@ PREAUTO := \
 	$(ERRCODES_RC) \
 	$(NCI_SERVICE_FILES)
 
-makefile.auto: $(RMKDIR_TARGET) $(BIN2RES_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)
 	$(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
 
 
 $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
-	$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC)
+	$(ECHO_WMC)
+	$(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC)
 
 $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
-	$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
+	$(ECHO_WMC)
+	$(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
 
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index af30e8c5962..bdaf5332d3b 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -336,7 +336,7 @@ MingwBackend::GenerateDirectoryTargets ()
 		if ( IncludeDirectoryTarget ( *i ) )
 		{
 			fprintf ( fMakefile,
-			          "%s:\n",
+			          "%s: $(RMKDIR_TARGET)\n",
 			          i->c_str () );
 			fprintf ( fMakefile, 
 			          "\t${mkdir} %s\n\n",
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 9ef1b3af21c..6d16616628a 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -725,8 +725,7 @@ MingwModuleHandler::GenerateGccCommand ( const Module& module,
 	string objectFilename = PassThruCacheDirectory (
 		GetObjectFilename ( module, sourceFilename ) );
 	fprintf ( fMakefile,
-	          "%s: %s %s\n",
-	          objectFilename.c_str (),
+	          "%s: %s\n",
 	          objectFilename.c_str (),
 	          deps.c_str () );
 	fprintf ( fMakefile, "\t$(ECHO_CC)\n" );
@@ -835,7 +834,7 @@ MingwModuleHandler::GenerateWinebuildCommands (
 	CLEAN_FILE ( stub_file );
 
 	fprintf ( fMakefile,
-	          "%s: %s\n",
+	          "%s: %s $(WINEBUILD_TARGET)\n",
 	          def_file.c_str (),
 	          sourceFilename.c_str () );
 	fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
@@ -1848,7 +1847,7 @@ MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget ( const Module
 {
 	fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n",
 	          module.name.c_str () );
-	fprintf ( fMakefile, "%s_extractresources: bin2res\n",
+	fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n",
 	          module.name.c_str () );
 	const vector<File*>& files = module.non_if_data.files;
 	for ( size_t i = 0; i < files.size (); i++ )
diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 23581e73cf7..3b4b1948b66 100644
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -13,6 +13,9 @@ RMKDIR_HOST_CFLAGS = -g -Werror -Wall
 
 RMKDIR_HOST_LFLAGS = -g
 
+.PHONY: rmkdir
+rmkdir: $(RMKDIR_TARGET)
+
 $(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS)
 	$(ECHO_LD)
 	${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
@@ -42,6 +45,9 @@ RSYM_HOST_CFLAGS = -g -Werror -Wall
 
 RSYM_HOST_LFLAGS = -g
 
+.PHONY: rsym
+rsym: $(RSYM_TARGET)
+
 $(RSYM_TARGET): $(RSYM_OBJECTS)
 	$(ECHO_LD)
 	${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET)
diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak
index 2bc87a2eb4a..e30cd5ef9d0 100644
--- a/reactos/tools/wmc/wmc.mak
+++ b/reactos/tools/wmc/wmc.mak
@@ -25,6 +25,9 @@ WMC_HOST_CXXFLAGS = -I$(WMC_BASE) -g -Werror -Wall
 
 WMC_HOST_LFLAGS = -g
 
+.PHONY: wmc
+wmc: $(WMC_TARGET)
+
 $(WMC_TARGET): $(WMC_BASE_DIR) $(WMC_OBJECTS)
 	$(ECHO_LD)
 	${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET)