ENH: Simplify makefile target generator listing of object files to clean.
This commit is contained in:
parent
674b8a7aab
commit
cd6abe486d
@ -474,12 +474,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
|
|||||||
// Write the main driver rule to build everything in this target.
|
// Write the main driver rule to build everything in this target.
|
||||||
this->WriteTargetDriverRule(targetFullPath.c_str(), relink);
|
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(),
|
this->CleanFiles.insert(this->CleanFiles.end(),
|
||||||
exeCleanFiles.begin(),
|
exeCleanFiles.begin(),
|
||||||
exeCleanFiles.end());
|
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.
|
// Write the main driver rule to build everything in this target.
|
||||||
this->WriteTargetDriverRule(targetFullPath.c_str(), relink);
|
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(),
|
this->CleanFiles.insert(this->CleanFiles.end(),
|
||||||
libCleanFiles.begin(),libCleanFiles.end());
|
libCleanFiles.begin(),libCleanFiles.end());
|
||||||
this->CleanFiles.insert(this->CleanFiles.end(),
|
|
||||||
this->Objects.begin(),
|
|
||||||
this->Objects.end());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -327,6 +327,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
|
|||||||
this->ExtraContent.insert(obj);
|
this->ExtraContent.insert(obj);
|
||||||
}
|
}
|
||||||
this->Objects.push_back(obj);
|
this->Objects.push_back(obj);
|
||||||
|
this->CleanFiles.push_back(obj);
|
||||||
|
|
||||||
// TODO: Remove
|
// TODO: Remove
|
||||||
//std::string relativeObj
|
//std::string relativeObj
|
||||||
|
Loading…
x
Reference in New Issue
Block a user