diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-01-14 21:28:38 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-01-14 21:28:38 (GMT) |
| commit | 0358cc83d05437987a9866b9ec5d3cd9a9928b7f (patch) | |
| tree | c0c38f9d6b45b3c259810e783ad8832429f16af8 | |
| parent | c88408141bcbaa5334818de13eaf6c4855c29346 (diff) | |
| download | CMake-0358cc83d05437987a9866b9ec5d3cd9a9928b7f.zip CMake-0358cc83d05437987a9866b9ec5d3cd9a9928b7f.tar.gz CMake-0358cc83d05437987a9866b9ec5d3cd9a9928b7f.tar.bz2 | |
remove extra logic not needed anymore because of better depends
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index a41e00c..346973a 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -1577,28 +1577,13 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) "all", "cmake.depends $(TARGETS) $(SUBDIR_BUILD)", 0); - if (m_Makefile->IsOn("QT_WRAP_CPP") || - m_Makefile->IsOn("QT_WRAP_UI") || - m_Makefile->IsOn("FLTK_WRAP_UI") ) - { - this->OutputMakeRule(fout, - "remove generated files and dependency file", - "clean", - "$(SUBDIR_CLEAN)", - "-@ $(RM) $(CLEAN_OBJECT_FILES) $(EXECUTABLES)" - " $(TARGETS) ${GENERATED_QT_FILES}" - " ${GENERATED_FLTK_FILES}", - "make depend"); - } - else - { - this->OutputMakeRule(fout, - "remove generated files", - "clean", - "$(SUBDIR_CLEAN)", - "-@ $(RM) $(CLEAN_OBJECT_FILES) $(EXECUTABLES)" - " $(TARGETS)"); - } + this->OutputMakeRule(fout, + "remove generated files", + "clean", + "$(SUBDIR_CLEAN)", + "-@ $(RM) $(CLEAN_OBJECT_FILES) $(EXECUTABLES)" + " $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)"); + // collect up all the sources std::string allsources; std::map<cmStdString, cmTarget>& targets = m_Makefile->GetTargets(); |