diff options
author | Ken Martin <ken.martin@kitware.com> | 2005-05-19 14:52:59 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2005-05-19 14:52:59 (GMT) |
commit | 1e78125a7b43bc2a6e447180017f78cfa88b3935 (patch) | |
tree | afa9216082250e73ba49b025b6e28be0068600fe /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | 1137970d541efc2cb6edb8f7c80aef2894e5c0d7 (diff) | |
download | CMake-1e78125a7b43bc2a6e447180017f78cfa88b3935.zip CMake-1e78125a7b43bc2a6e447180017f78cfa88b3935.tar.gz CMake-1e78125a7b43bc2a6e447180017f78cfa88b3935.tar.bz2 |
ENH: some performance improvements
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index a4441b3..a11d2cf 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -101,7 +101,11 @@ void cmGlobalUnixMakefileGenerator3::Generate() this->WriteMainCMakefile(); // now write the support Makefiles - this->WriteBuildMakefile(); + + // we no longr use the build makefile, TODO remove this code and the code + // it makes use of later on + // this->WriteBuildMakefile(); + this->WriteCleanMakefile(); } @@ -504,20 +508,25 @@ cmGlobalUnixMakefileGenerator3 { // Add a rule to build the target by name. localName = lg->GetRelativeTargetDirectory(t->second); + std::string makefileName = localName; + makefileName += "/build.make"; commands.clear(); if (t->second.GetType() != cmTarget::UTILITY) { makeTargetName = localName; makeTargetName += "/depend"; - commands.push_back(lg->GetRecursiveMakeCall("build.make",makeTargetName.c_str())); + commands.push_back(lg->GetRecursiveMakeCall(makefileName.c_str(), + makeTargetName.c_str())); makeTargetName = localName; makeTargetName += "/requires"; - commands.push_back(lg->GetRecursiveMakeCall("build.make",makeTargetName.c_str())); + commands.push_back(lg->GetRecursiveMakeCall(makefileName.c_str(), + makeTargetName.c_str())); } makeTargetName = localName; makeTargetName += "/build"; - commands.push_back(lg->GetRecursiveMakeCall("build.make",makeTargetName.c_str())); + commands.push_back(lg->GetRecursiveMakeCall(makefileName.c_str(), + makeTargetName.c_str())); // Write the rule. localName += "/all"; |