diff options
| author | Brad King <brad.king@kitware.com> | 2004-11-03 13:59:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2004-11-03 13:59:13 (GMT) |
| commit | 30e685b41f9dc18bfdde373b9265bebaafb0b9d9 (patch) | |
| tree | ee3fb919d05bf63c364404ecb88559bb52a1f156 | |
| parent | 8a4c0673be2e928e051706aaaea5ba83d5992ce4 (diff) | |
| download | CMake-30e685b41f9dc18bfdde373b9265bebaafb0b9d9.zip CMake-30e685b41f9dc18bfdde373b9265bebaafb0b9d9.tar.gz CMake-30e685b41f9dc18bfdde373b9265bebaafb0b9d9.tar.bz2 | |
ENH: Removed unneeded requires rules now that canonical names are available.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator2.cxx | 34 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator2.h | 2 |
2 files changed, 5 insertions, 31 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index 131a6e3..7e772b9 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -974,13 +974,15 @@ cmLocalUnixMakefileGenerator2 // Special target to cleanup operation of make tool. std::vector<std::string> depends; - depends.push_back(".hpux_make_must_have_this_dependency_here"); this->WriteMakeRule(makefileStream, - "Disable some common implicit rules to speed things up.", + "Disable implicit rules so canoncical targets will work.", 0, ".SUFFIXES", depends, no_commands); + depends.push_back(".hpux_make_must_have_suffixes_list"); + this->WriteMakeRule(makefileStream, 0, 0, + ".SUFFIXES", depends, no_commands); } //---------------------------------------------------------------------------- @@ -1048,7 +1050,7 @@ cmLocalUnixMakefileGenerator2 { if(t->second.IsInAll()) { - depends.push_back(t->first+".requires"); + depends.push_back(t->first); } } } @@ -1222,25 +1224,6 @@ cmLocalUnixMakefileGenerator2 //---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator2 -::WriteRequiresRule(std::ostream& ruleFileStream, const cmTarget& target, - const char* targetFullPath) -{ - // TODO: Avoid using requires target except when needed for - // Fortran/Java dependencies. - std::vector<std::string> depends; - std::vector<std::string> no_commands; - std::string reqComment = "Requirements for target "; - reqComment += target.GetName(); - std::string reqTarget = target.GetName(); - reqTarget += ".requires"; - depends.push_back(targetFullPath); - this->WriteMakeRule(ruleFileStream, reqComment.c_str(), 0, - reqTarget.c_str(), depends, no_commands); -} - -//---------------------------------------------------------------------------- -void -cmLocalUnixMakefileGenerator2 ::WriteConvenienceRules(std::ostream& ruleFileStream, const cmTarget& target, const char* targetFullPath) { @@ -1448,9 +1431,6 @@ cmLocalUnixMakefileGenerator2 // Write convenience targets. this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str()); - - // Write driver rule for this target. - this->WriteRequiresRule(ruleFileStream, target, targetFullPath.c_str()); } //---------------------------------------------------------------------------- @@ -1702,9 +1682,6 @@ cmLocalUnixMakefileGenerator2 // Write convenience targets. this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str()); - - // Write driver rule for this target. - this->WriteRequiresRule(ruleFileStream, target, targetFullPath.c_str()); } //---------------------------------------------------------------------------- @@ -2087,7 +2064,6 @@ cmLocalUnixMakefileGenerator2 dep += ".depends"; dep = this->ConvertToRelativeOutputPath(dep.c_str()); std::string tgt = jump->first; - tgt += ".requires"; tgt = this->ConvertToRelativeOutputPath(tgt.c_str()); // Build the jump-and-build command list. diff --git a/Source/cmLocalUnixMakefileGenerator2.h b/Source/cmLocalUnixMakefileGenerator2.h index c238155..3c62a2f 100644 --- a/Source/cmLocalUnixMakefileGenerator2.h +++ b/Source/cmLocalUnixMakefileGenerator2.h @@ -87,8 +87,6 @@ protected: const char* subdir, std::string& last); void WriteSubdirDriverRule(std::ostream& makefileStream, const char* pass, const char* order, const std::string& last); - void WriteRequiresRule(std::ostream& ruleFileStream, const cmTarget& target, - const char* targetFullPath); void WriteConvenienceRules(std::ostream& ruleFileStream, const cmTarget& target, const char* targetFullPath); |