kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: make the clean target work

Browse Source
This commit is contained in:
Bill Hoffman 2005-10-28 11:02:29 -04:00
parent 946c9a2cc6
commit 08be73fff1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -162,7 +162,7 @@ void cmLocalUnixMakefileGenerator3
if (clean) if (clean)
{ {
cleanFiles.push_back cleanFiles.push_back
(this->Convert(cc->GetOutput(),HOME_OUTPUT,SHELL)); (this->Convert(cc->GetOutput(),START_OUTPUT,SHELL));
} }
} }
} }
@ -1372,11 +1372,11 @@ cmLocalUnixMakefileGenerator3
std::string cleanFullName = outpath + cleanName; std::string cleanFullName = outpath + cleanName;
std::string cleanFullRealName = outpath + cleanRealName; std::string cleanFullRealName = outpath + cleanRealName;
exeCleanFiles.push_back exeCleanFiles.push_back
(this->Convert(cleanFullName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullName.c_str(),START_OUTPUT,MAKEFILE));
if(cleanRealName != cleanName) if(cleanRealName != cleanName)
{ {
exeCleanFiles.push_back exeCleanFiles.push_back
(this->Convert(cleanFullRealName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullRealName.c_str(),START_OUTPUT,MAKEFILE));
} }
} }
// Add a command to remove any existing files for this executable. // Add a command to remove any existing files for this executable.
@ -1693,24 +1693,24 @@ cmLocalUnixMakefileGenerator3
std::string cleanFullSharedSOName = outpath + cleanSharedSOName; std::string cleanFullSharedSOName = outpath + cleanSharedSOName;
std::string cleanFullSharedRealName = outpath + cleanSharedRealName; std::string cleanFullSharedRealName = outpath + cleanSharedRealName;
libCleanFiles.push_back libCleanFiles.push_back
(this->Convert(cleanFullStaticName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullStaticName.c_str(),START_OUTPUT,MAKEFILE));
if(cleanSharedRealName != cleanStaticName) if(cleanSharedRealName != cleanStaticName)
{ {
libCleanFiles.push_back libCleanFiles.push_back
(this->Convert(cleanFullSharedRealName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullSharedRealName.c_str(),START_OUTPUT,MAKEFILE));
} }
if(cleanSharedSOName != cleanStaticName && if(cleanSharedSOName != cleanStaticName &&
cleanSharedSOName != cleanSharedRealName) cleanSharedSOName != cleanSharedRealName)
{ {
libCleanFiles.push_back libCleanFiles.push_back
(this->Convert(cleanFullSharedSOName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullSharedSOName.c_str(),START_OUTPUT,MAKEFILE));
} }
if(cleanSharedName != cleanStaticName && if(cleanSharedName != cleanStaticName &&
cleanSharedName != cleanSharedSOName && cleanSharedName != cleanSharedSOName &&
cleanSharedName != cleanSharedRealName) cleanSharedName != cleanSharedRealName)
{ {
libCleanFiles.push_back libCleanFiles.push_back
(this->Convert(cleanFullSharedName.c_str(),HOME_OUTPUT,MAKEFILE)); (this->Convert(cleanFullSharedName.c_str(),START_OUTPUT,MAKEFILE));
} }
} }
@ -1927,7 +1927,8 @@ cmLocalUnixMakefileGenerator3
// Construct the clean command. // Construct the clean command.
this->AppendCleanCommand(commands, files); this->AppendCleanCommand(commands, files);
this->CreateCDCommand(commands,m_Makefile->GetStartOutputDirectory(),
m_Makefile->GetHomeOutputDirectory());
// Write the rule. // Write the rule.
this->WriteMakeRule(ruleFileStream, 0, this->WriteMakeRule(ruleFileStream, 0,
cleanTarget.c_str(), no_depends, commands); cleanTarget.c_str(), no_depends, commands);