diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-06-14 14:19:34 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-06-14 14:19:34 (GMT) |
| commit | 48294a75ca6522483b01ec2cfcf152c32abb6e3f (patch) | |
| tree | dd4e32ed6dfaee850c0f41fa9feda577922540a6 | |
| parent | f0d07f5411baedf98e9193cc09017992c247dd00 (diff) | |
| download | CMake-48294a75ca6522483b01ec2cfcf152c32abb6e3f.zip CMake-48294a75ca6522483b01ec2cfcf152c32abb6e3f.tar.gz CMake-48294a75ca6522483b01ec2cfcf152c32abb6e3f.tar.bz2 | |
BUG: fix it so that if a Makefile is out of date for some reason, it is only built once, it was doing it twice.
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index af4b314..bc2ca57 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1048,10 +1048,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) ".cxx.o", 0, "${CMAKE_CXX_COMPILER} ${CMAKE_CXXFLAGS} ${INCLUDE_FLAGS} -c $< -o $@"); + // only include the cmake.depends and not the Makefile, as + // building one will cause the other to be built this->OutputMakeRule(fout, "Default build rule", "all", - "Makefile cmake.depends ${TARGETS} ${SUBDIR_BUILD} ${CMAKE_COMMAND}", + "cmake.depends ${TARGETS} ${SUBDIR_BUILD} ${CMAKE_COMMAND}", 0); this->OutputMakeRule(fout, "remove generated files", @@ -1059,14 +1061,7 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) "${SUBDIR_CLEAN}", "rm -f ${CLEAN_OBJECT_FILES} ${EXECUTABLES} ${TARGETS}"); this->OutputMakeRule(fout, - "Rule to build the Makefile", - "Makefile", - "${CMAKE_COMMAND} ${CMAKE_MAKEFILE_SOURCES} ", - "${CMAKE_COMMAND} " - "-S${CMAKE_CURRENT_SOURCE} -O${CMAKE_CURRENT_BINARY} " - "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}"); - this->OutputMakeRule(fout, - "Rule to build the cmake.depends", + "Rule to build the cmake.depends and Makefile as side effect", "cmake.depends", "${CMAKE_COMMAND} ${CMAKE_MAKEFILE_SOURCES} ", "${CMAKE_COMMAND} " |