From 5a4f27b61ce010dd3941ec5fc21a5d87916216e5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 1 Jun 2005 13:19:53 -0400 Subject: BUG: Fixed name given to clean target listing for executable and library targets. --- Source/cmLocalUnixMakefileGenerator3.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 7211b24..f6a4816 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1414,7 +1414,7 @@ cmLocalUnixMakefileGenerator3 buildTargetRuleName.c_str()); cleanFiles.push_back(cleanObjs); - cleanFiles.push_back(targetOutPath.c_str()); + cleanFiles.push_back(targetFullPath.c_str()); } //---------------------------------------------------------------------------- @@ -1655,9 +1655,6 @@ cmLocalUnixMakefileGenerator3 // Add a command to remove any existing files for this library. this->AppendCleanCommand(commands, libCleanFiles); - // add the libCleanFiles to to taoal cleanFiles - cleanFiles.insert(cleanFiles.end(),libCleanFiles.begin(),libCleanFiles.end()); - // Add the pre-build and pre-link rules. this->AppendCustomCommands(commands, target.GetPreBuildCommands()); this->AppendCustomCommands(commands, target.GetPreLinkCommands()); @@ -1732,8 +1729,9 @@ cmLocalUnixMakefileGenerator3 this->WriteConvenienceRule(ruleFileStream, targetFullPath.c_str(), buildTargetRuleName.c_str()); + // Clean all the possible library names and symlinks and object files. + cleanFiles.insert(cleanFiles.end(),libCleanFiles.begin(),libCleanFiles.end()); cleanFiles.push_back(cleanObjs); - cleanFiles.push_back(targetOutPath.c_str()); } //---------------------------------------------------------------------------- -- cgit v0.12