diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-01 18:16:39 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:39:58 +0200 |
commit | b35d8e651b2b9f4f20fa1f279c54a6974b4d08ae (patch) | |
tree | 9ae1d1a981debdd4eda9a0254b8a4e2d77908cd8 | |
parent | c85dc033dc58b06f1fc3cef6c2667f6516ac12b4 (diff) |
don't generate make_default targets
make_first really means the same, as the default target is 'first'
which immediately invokes make_first.
as a nice side effect, this fixes ALL_DEPS not being used by the subdirs
template's default target - make_default wasn't special-cased in the
right place, while make_first is.
Change-Id: I946cea3b2dae198eda61d31dbd19c6ccd15deac7
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
-rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 97370f06d7..6d824619d8 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2362,7 +2362,7 @@ void MakefileGenerator::writeSubDirs(QTextStream &t) { QList<SubTarget*> targets = findSubDirsSubTargets(); - t << "first: make_default" << endl; + t << "first: make_first" << endl; int flags = SubTargetInstalls; if(project->isActiveConfig("ordered")) flags |= SubTargetOrdered; @@ -2419,7 +2419,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT QStringList targetSuffixes; const QString abs_source_path = project->first("QMAKE_ABSOLUTE_SOURCE_PATH"); if (!(flags & SubTargetSkipDefaultTargets)) { - targetSuffixes << "make_default" << "make_first" << "all" << "clean" << "distclean" + targetSuffixes << "make_first" << "all" << "clean" << "distclean" << QString((flags & SubTargetInstalls) ? "install_subtargets" : "install") << QString((flags & SubTargetInstalls) ? "uninstall_subtargets" : "uninstall"); } @@ -2511,8 +2511,6 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT else if(s == "uninstall_subtargets") s = "uninstall"; else if(s == "make_first") - s = "first"; - else if(s == "make_default") s = QString(); if(flags & SubTargetOrdered) { @@ -2562,7 +2560,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT t << suffix << ":"; for(int target = 0; target < targets.size(); ++target) { SubTarget *subTarget = targets.at(target); - if((suffix == "make_first" || suffix == "make_default") + if (suffix == "make_first" && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; } |