Selaa lähdekoodia

remove extra logic not needed anymore because of better depends

Bill Hoffman 24 vuotta sitten
vanhempi
sitoutus
0358cc83d0
1 muutettua tiedostoa jossa 7 lisäystä ja 22 poistoa
  1. 7 22
      Source/cmUnixMakefileGenerator.cxx

+ 7 - 22
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();