kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove extra logic not needed anymore because of better depends

Browse Source
This commit is contained in:
Bill Hoffman 2002-01-14 16:28:38 -05:00
parent c88408141b
commit 0358cc83d0
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/cmUnixMakefileGenerator.cxx
View File

@ -1577,28 +1577,13 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"all", "all",
"cmake.depends $(TARGETS) $(SUBDIR_BUILD)", "cmake.depends $(TARGETS) $(SUBDIR_BUILD)",
0); 0);
if (m_Makefile->IsOn("QT_WRAP_CPP") || this->OutputMakeRule(fout,
m_Makefile->IsOn("QT_WRAP_UI") || "remove generated files",
m_Makefile->IsOn("FLTK_WRAP_UI") ) "clean",
{ "$(SUBDIR_CLEAN)",
this->OutputMakeRule(fout, "-@ $(RM) $(CLEAN_OBJECT_FILES) $(EXECUTABLES)"
"remove generated files and dependency file", " $(TARGETS) $(GENERATED_QT_FILES) $(GENERATED_FLTK_FILES)");
"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)");
}
// collect up all the sources // collect up all the sources
std::string allsources; std::string allsources;
std::map<cmStdString, cmTarget>& targets = m_Makefile->GetTargets(); std::map<cmStdString, cmTarget>& targets = m_Makefile->GetTargets();