ENH: Cleaned up generation of directory-level rules and their support structure. The directorystart rule has been removed in favor of checking the build system in the subdirectory makefile first. The "directory" rule has been renamed "all" since it corresponds to the "all" pass anyway (as against "clean"). Also fixed directory-level rule for preinstall.

1 files changed, 6 insertions, 4 deletions

diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 23ad6f1..33083ec 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -104,10 +104,12 @@ protected:
                               cmLocalUnixMakefileGenerator3 *,
                               bool exclude);
 
-  void WriteDirectoryRules(std::ostream& ruleFileStream, 
-                           cmLocalUnixMakefileGenerator3 *lg);
-  void WriteDirectoryRules2(std::ostream& ruleFileStream, 
-                            cmLocalUnixMakefileGenerator3 *lg);
+  void WriteDirectoryRule2(std::ostream& ruleFileStream,
+                           cmLocalUnixMakefileGenerator3* lg,
+                           const char* pass, bool check_all,
+                           bool check_relink);
+  void WriteDirectoryRules2(std::ostream& ruleFileStream,
+                            cmLocalUnixMakefileGenerator3* lg);
 
   void AppendGlobalTargetDepends(std::vector<std::string>& depends,
                                  cmTarget& target);