Makefile: Re-order list of files to clean

Revise construction of the list of files to be cleaned for the target to
list the "real" file first.
This commit is contained in:
Gregor Jasny
2017-01-20 23:24:05 +01:00
committed by Brad King
parent b8db2ed796
commit 8643ca75c7

View File

@@ -597,12 +597,12 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
// Clean files associated with this library.
std::vector<std::string> libCleanFiles;
libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath));
if (targetNameReal != targetName) {
this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal));
if (targetName != targetNameReal) {
libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathReal));
this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPath));
}
if (targetNameSO != targetName && targetNameSO != targetNameReal) {
if (targetNameSO != targetNameReal && targetNameSO != targetName) {
libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath(
this->LocalGenerator->GetCurrentBinaryDirectory(), targetFullPathSO));
}