From 0358cc83d05437987a9866b9ec5d3cd9a9928b7f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 14 Jan 2002 16:28:38 -0500 Subject: [PATCH] remove extra logic not needed anymore because of better depends --- Source/cmUnixMakefileGenerator.cxx | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index a41e00c5b..346973a54 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& targets = m_Makefile->GetTargets();