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 f32aaff..dc8e8cf 100644 (file)
--- 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 af30e8c..bdaf533 100644 (file)
--- 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 ) )\r
                {\r
                        fprintf ( fMakefile,\r
-                                 "%s:\n",\r
+                                 "%s: $(RMKDIR_TARGET)\n",\r
                                  i->c_str () );\r
                        fprintf ( fMakefile, \r
                                  "\t${mkdir} %s\n\n",\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 9ef1b3a..6d16616 100644 (file)
--- 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 (\r
                GetObjectFilename ( module, sourceFilename ) );\r
        fprintf ( fMakefile,\r
-                 "%s: %s %s\n",\r
-                 objectFilename.c_str (),\r
+                 "%s: %s\n",\r
                  objectFilename.c_str (),\r
                  deps.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_CC)\n" );\r
@@ -835,7 +834,7 @@ MingwModuleHandler::GenerateWinebuildCommands (
        CLEAN_FILE ( stub_file );\r
 \r
        fprintf ( fMakefile,\r
-                 "%s: %s\n",\r
+                 "%s: %s $(WINEBUILD_TARGET)\n",\r
                  def_file.c_str (),\r
                  sourceFilename.c_str () );\r
        fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );\r
@@ -1848,7 +1847,7 @@ MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget ( const Module
 {\r
        fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n",\r
                  module.name.c_str () );\r
-       fprintf ( fMakefile, "%s_extractresources: bin2res\n",\r
+       fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n",\r
                  module.name.c_str () );\r
        const vector<File*>& files = module.non_if_data.files;\r
        for ( size_t i = 0; i < files.size (); i++ )\r

diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 23581e7..3b4b194 100644 (file)
--- 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 2bc87a2..e30cd5e 100644 (file)
--- 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)