ENH: added clean target for subdirs
This commit is contained in:
parent
d7cbf3e1d6
commit
a2f148936b
|
@ -477,7 +477,8 @@ cmGlobalUnixMakefileGenerator3
|
||||||
|
|
||||||
// write the directory rule
|
// write the directory rule
|
||||||
commands.clear();
|
commands.clear();
|
||||||
commands.push_back(lg->GetRecursiveMakeCall("Makefile",makeTargetName.c_str()));
|
commands.push_back
|
||||||
|
(lg->GetRecursiveMakeCall("Makefile",makeTargetName.c_str()));
|
||||||
|
|
||||||
// Write the rule.
|
// Write the rule.
|
||||||
lg->WriteMakeRule(ruleFileStream, "Convenience name for directory.",
|
lg->WriteMakeRule(ruleFileStream, "Convenience name for directory.",
|
||||||
|
@ -489,6 +490,55 @@ cmGlobalUnixMakefileGenerator3
|
||||||
makeTargetName.c_str(), all_tgts, commands);
|
makeTargetName.c_str(), all_tgts, commands);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// now do the clean targets
|
||||||
|
if (lg->GetParent())
|
||||||
|
{
|
||||||
|
std::string dir = lg->GetMakefile()->GetStartOutputDirectory();
|
||||||
|
dir = lg->Convert(dir.c_str(),cmLocalGenerator::HOME_OUTPUT,cmLocalGenerator::MAKEFILE);
|
||||||
|
makeTargetName = dir;
|
||||||
|
makeTargetName += "/clean";
|
||||||
|
|
||||||
|
std::vector<std::string> all_tgts;
|
||||||
|
|
||||||
|
// for all of out targets
|
||||||
|
for (cmTargets::const_iterator l = lg->GetMakefile()->GetTargets().begin();
|
||||||
|
l != lg->GetMakefile()->GetTargets().end(); l++)
|
||||||
|
{
|
||||||
|
if((l->second.GetType() == cmTarget::EXECUTABLE) ||
|
||||||
|
(l->second.GetType() == cmTarget::STATIC_LIBRARY) ||
|
||||||
|
(l->second.GetType() == cmTarget::SHARED_LIBRARY) ||
|
||||||
|
(l->second.GetType() == cmTarget::MODULE_LIBRARY) ||
|
||||||
|
(l->second.GetType() == cmTarget::UTILITY))
|
||||||
|
{
|
||||||
|
// Add this to the list of depends rules in this directory.
|
||||||
|
std::string tname = lg->GetRelativeTargetDirectory(l->second);
|
||||||
|
tname += "/clean";
|
||||||
|
all_tgts.push_back(tname);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// write the directory rule add in the subdirs
|
||||||
|
std::vector<cmLocalGenerator *> subdirs = lg->GetChildren();
|
||||||
|
|
||||||
|
// for each subdir add the directory depend
|
||||||
|
std::vector<cmLocalGenerator *>::iterator sdi = subdirs.begin();
|
||||||
|
for (; sdi != subdirs.end(); ++sdi)
|
||||||
|
{
|
||||||
|
cmLocalUnixMakefileGenerator3 * lg2 =
|
||||||
|
static_cast<cmLocalUnixMakefileGenerator3 *>(*sdi);
|
||||||
|
dir = lg2->GetMakefile()->GetStartOutputDirectory();
|
||||||
|
dir += "/clean";
|
||||||
|
dir = lg2->Convert(dir.c_str(),cmLocalGenerator::HOME_OUTPUT,
|
||||||
|
cmLocalGenerator::MAKEFILE);
|
||||||
|
all_tgts.push_back(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
// write the directory clean rule
|
||||||
|
commands.clear();
|
||||||
|
lg->WriteMakeRule(ruleFileStream, "Convenience name for directory clean.",
|
||||||
|
makeTargetName.c_str(), all_tgts, commands);
|
||||||
|
}
|
||||||
|
|
||||||
// for each target Generate the rule files for each target.
|
// for each target Generate the rule files for each target.
|
||||||
const cmTargets& targets = lg->GetMakefile()->GetTargets();
|
const cmTargets& targets = lg->GetMakefile()->GetTargets();
|
||||||
bool needRequiresStep = this->NeedRequiresStep(lg);
|
bool needRequiresStep = this->NeedRequiresStep(lg);
|
||||||
|
|
|
@ -611,30 +611,6 @@ cmLocalUnixMakefileGenerator3
|
||||||
p_depends.push_back(relativeObj);
|
p_depends.push_back(relativeObj);
|
||||||
this->WriteMakeRule(ruleFileStream, 0,
|
this->WriteMakeRule(ruleFileStream, 0,
|
||||||
temp.c_str(), p_depends, no_commands);
|
temp.c_str(), p_depends, no_commands);
|
||||||
|
|
||||||
#if 0
|
|
||||||
if(strcmp(lang, "Fortran") == 0)
|
|
||||||
{
|
|
||||||
std::string objectProvides = obj;
|
|
||||||
objectProvides += ".provides";
|
|
||||||
// Add the provides target to build the object file.
|
|
||||||
std::vector<std::string> p_depends;
|
|
||||||
p_depends.push_back(obj);
|
|
||||||
this->WriteMakeRule(ruleFileStream, 0,
|
|
||||||
objectProvides.c_str(), p_depends, no_commands);
|
|
||||||
|
|
||||||
{
|
|
||||||
// Add the requires.build target to recursively build the provides
|
|
||||||
// target after needed information is up to date.
|
|
||||||
std::vector<std::string> no_depends;
|
|
||||||
std::vector<std::string> r_commands;
|
|
||||||
r_commands.push_back(this->GetRecursiveMakeCall("Makefile",objectProvides.c_str()));
|
|
||||||
objectRequires += ".build";
|
|
||||||
this->WriteMakeRule(ruleFileStream, 0,
|
|
||||||
objectRequires.c_str(), no_depends, r_commands);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
@ -2835,13 +2811,21 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
|
||||||
std::vector<std::string> depends;
|
std::vector<std::string> depends;
|
||||||
std::vector<std::string> commands;
|
std::vector<std::string> commands;
|
||||||
|
|
||||||
// Write the empty all rule.
|
// Write the all rule.
|
||||||
std::string dir = m_Makefile->GetStartOutputDirectory();
|
std::string dir = m_Makefile->GetStartOutputDirectory();
|
||||||
dir += "/directorystart";
|
dir += "/directorystart";
|
||||||
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
|
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
|
||||||
this->CreateJumpCommand(commands,dir);
|
this->CreateJumpCommand(commands,dir);
|
||||||
this->WriteMakeRule(ruleFileStream, "The main all target", "all", depends, commands);
|
this->WriteMakeRule(ruleFileStream, "The main all target", "all", depends, commands);
|
||||||
|
|
||||||
|
// Write the clean rule.
|
||||||
|
dir = m_Makefile->GetStartOutputDirectory();
|
||||||
|
dir += "/clean";
|
||||||
|
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
|
||||||
|
commands.clear();
|
||||||
|
this->CreateJumpCommand(commands,dir);
|
||||||
|
this->WriteMakeRule(ruleFileStream, "The main clean target", "clean", depends, commands);
|
||||||
|
|
||||||
// recursively write our targets
|
// recursively write our targets
|
||||||
this->WriteLocalMakefileTargets(ruleFileStream);
|
this->WriteLocalMakefileTargets(ruleFileStream);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue