Commit cd6abe48 authored by Brad King's avatar Brad King
Browse files

ENH: Simplify makefile target generator listing of object files to clean.

parent 674b8a7a
......@@ -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());
}
......@@ -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());
}
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment