diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-31 16:54:14 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-31 16:54:14 (GMT) |
| commit | d1fb9d757f8a3f6d721c516ba3ac2e2ec92d9be1 (patch) | |
| tree | becb7ac8a9b0d1f4e598ec28b02715be11787810 /Source/cmNMakeMakefileGenerator.cxx | |
| parent | cff85a6386e8cb38f97e53e94d1d1467e0e08eeb (diff) | |
| download | CMake-d1fb9d757f8a3f6d721c516ba3ac2e2ec92d9be1.zip CMake-d1fb9d757f8a3f6d721c516ba3ac2e2ec92d9be1.tar.gz CMake-d1fb9d757f8a3f6d721c516ba3ac2e2ec92d9be1.tar.bz2 | |
ENH: remove one call to make, and clean echo stuff a bit
Diffstat (limited to 'Source/cmNMakeMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index 5b945a1..99869fa 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -309,7 +309,8 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout, { replace = ShortPathCommand(command); m_Makefile->ExpandVariablesInString(replace); - if(replace[0] != '-' && replace.find("echo") != 0) + if(replace[0] != '-' && replace.find("echo") != 0 + && replace.find("$(MAKE)") != 0) { fout << "\t" << "echo " << replace.c_str() << "\n"; } @@ -319,7 +320,8 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout, { replace = ShortPathCommand(command2); m_Makefile->ExpandVariablesInString(replace); - if(replace[0] != '-' && replace.find("echo") != 0) + if(replace[0] != '-' && replace.find("echo") != 0 + && replace.find("$(MAKE)") != 0) { fout << "\t" << "echo " << replace.c_str() << "\n"; } @@ -329,7 +331,8 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout, { replace = ShortPathCommand(command3); m_Makefile->ExpandVariablesInString(replace); - if(replace[0] != '-' && replace.find("echo") != 0) + if(replace[0] != '-' && replace.find("echo") != 0 + && replace.find("$(MAKE)") != 0) { fout << "\t" << "echo " << replace.c_str() << "\n"; } @@ -339,7 +342,8 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout, { replace = ShortPathCommand(command4); m_Makefile->ExpandVariablesInString(replace); - if(replace[0] != '-' && replace.find("echo") != 0) + if(replace[0] != '-' && replace.find("echo") != 0 + && replace.find("$(MAKE)") != 0) { fout << "\t" << "echo " << replace.c_str() << "\n"; } @@ -722,7 +726,6 @@ void cmNMakeMakefileGenerator::OutputBuildLibraryInDir(std::ostream& fout, fout << cmSystemTools::EscapeSpaces(fullpath) << ":\n\tcd " << cmSystemTools::EscapeSpaces(path) << "\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) cmake.depends\n" - << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) cmake.check_depends\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) -f cmake.check_depends\n" << "\t$(MAKE) $(MAKESILENT) " << cmSystemTools::EscapeSpaces(fullpath) << "\n\tcd " << |