BUG: Custom command outputs listed explicitly as source files in a target should be generated whether or not an object file in the target needs them. This useful and makes Makefile builds more consistent with VS IDE builds.

1 files changed, 8 insertions, 5 deletions

diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index c2422d7..35c702d 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -55,11 +55,13 @@ protected:
   // create the file and directory etc
   void CreateRuleFile();
 
-  // outputs the rules for any custom commands used by this target
-  void WriteCustomCommandsForTarget();
+  // outputs the rules for object files and custom commands used by
+  // this target
+  void WriteTargetBuildRules();
 
   // write some common code at the top of build.make
   void WriteCommonCodeRules();
+  void WriteTargetLanguageFlags();
 
   // write the provide require rules for this target
   void WriteTargetRequiresRules();
@@ -83,15 +85,16 @@ protected:
   void WriteObjectDependRules(cmSourceFile& source,
                               std::vector<std::string>& depends);
 
-  // this is responsible for writing all of the rules for all this
-  // directories custom commands (but not utility targets)
-  void WriteCustomCommands();
+  // write the build rule for a custom command
   void GenerateCustomRuleFile(const cmCustomCommand& cc);
 
   // write out the variable that lists the objects for this target
   void WriteObjectsVariable(std::string& variableName,
                             std::string& variableNameExternal);
 
+  // write the driver rule to build target outputs
+  void WriteTargetDriverRule(const char* main_output, bool relink);
+
   // Return the a string with -F flags on apple
   std::string GetFrameworkFlags();