From 33efcc442bbe8a2981113861e8f828732b72f127 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 27 Jul 2005 11:36:43 -0400 Subject: ENH: fix some warnings and cleanup some --- Source/cmLocalUnixMakefileGenerator3.cxx | 22 +++------------------- Source/cmLocalUnixMakefileGenerator3.h | 3 +-- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 4f09b1b..aab55f9 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1192,7 +1192,7 @@ cmLocalUnixMakefileGenerator3 std::vector& cleanFiles) { // Write the dependency generation rule. - this->WriteTargetDependRule(ruleFileStream, target, objects); + this->WriteTargetDependRule(ruleFileStream, target); std::vector commands; @@ -1505,7 +1505,7 @@ cmLocalUnixMakefileGenerator3 std::vector& cleanFiles) { // Write the dependency generation rule. - this->WriteTargetDependRule(ruleFileStream, target, objects); + this->WriteTargetDependRule(ruleFileStream, target); // TODO: Merge the methods that call this method to avoid // code duplication. @@ -1780,9 +1780,7 @@ cmLocalUnixMakefileGenerator3 //---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 -::WriteTargetDependRule(std::ostream& ruleFileStream, - cmTarget& target, - const std::vector& objects) +::WriteTargetDependRule(std::ostream& ruleFileStream, cmTarget& target) { // must write the targets depend info file std::string dir = this->GetTargetDirectory(target); @@ -1838,20 +1836,6 @@ cmLocalUnixMakefileGenerator3 // Write the rule. this->WriteMakeRule(ruleFileStream, 0, depMark.c_str(), depends, commands); - -#if 0 - // This target drives dependency generation for all object files. - std::string relPath = this->GetHomeRelativeOutputPath(); - std::string objTarget; - for(std::vector::const_iterator obj = objects.begin(); - obj != objects.end(); ++obj) - { - objTarget = relPath; - objTarget += *obj; - objTarget += ".depend"; - depends.push_back(objTarget); - } -#endif } //---------------------------------------------------------------------------- diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 1a4fae2..8aa979f 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -285,8 +285,7 @@ protected: std::string& variableName, std::string& variableNameExternal); void WriteTargetDependRule(std::ostream& ruleFileStream, - cmTarget& target, - const std::vector& objects); + cmTarget& target); void WriteTargetCleanRule(std::ostream& ruleFileStream, cmTarget& target, const std::vector& files); -- cgit v0.12