diff options
| author | Brad King <brad.king@kitware.com> | 2007-08-02 13:37:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-08-02 13:37:10 (GMT) |
| commit | cd6abe486d271940719c673dd5e75f911f428dbd (patch) | |
| tree | 7a3f6a29c1a9447e8ffdcae55ce8c781d9c908da | |
| parent | 674b8a7aab9ae4f310cb44420bce9263404c8818 (diff) | |
| download | CMake-cd6abe486d271940719c673dd5e75f911f428dbd.zip CMake-cd6abe486d271940719c673dd5e75f911f428dbd.tar.gz CMake-cd6abe486d271940719c673dd5e75f911f428dbd.tar.bz2 | |
ENH: Simplify makefile target generator listing of object files to clean.
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 94f1bdf..17b2578 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -474,12 +474,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Write the main driver rule to build everything in this target. this->WriteTargetDriverRule(targetFullPath.c_str(), relink); - // Clean all the possible executable names and symlinks and object files. + // Clean all the possible executable names and symlinks. this->CleanFiles.insert(this->CleanFiles.end(), exeCleanFiles.begin(), exeCleanFiles.end()); - this->CleanFiles.insert(this->CleanFiles.end(), - this->Objects.begin(), - this->Objects.end()); } - diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 2025f25..4cb7c3e 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -911,11 +911,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules // Write the main driver rule to build everything in this target. this->WriteTargetDriverRule(targetFullPath.c_str(), relink); - // Clean all the possible library names and symlinks and object files. + // Clean all the possible library names and symlinks. this->CleanFiles.insert(this->CleanFiles.end(), - libCleanFiles.begin(),libCleanFiles.end()); - this->CleanFiles.insert(this->CleanFiles.end(), - this->Objects.begin(), - this->Objects.end()); + libCleanFiles.begin(),libCleanFiles.end()); } - diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 9476319..3a990fe 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -327,6 +327,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source) this->ExtraContent.insert(obj); } this->Objects.push_back(obj); + this->CleanFiles.push_back(obj); // TODO: Remove //std::string relativeObj |