summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-05-12 07:45:55 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-12 22:36:59 (GMT)
commit96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30 (patch)
tree29dc4715466e108a53fe042bc58bfa6323d6b965 /qmake
parent637456edef085d1825f15429cd921f2f0d4bd6a2 (diff)
downloadQt-96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30.zip
Qt-96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30.tar.gz
Qt-96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30.tar.bz2
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make. This would break in the case where the correct makefile was not named `Makefile'. The included autotest demonstrates the problem. Note that this was fixed for normal targets back in 2005 by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not fixed for extra targets. Reviewed-by: ossi
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/makefile.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 595768f..e4764e0 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2638,10 +2638,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
QString out_directory_cdin, out_directory_cdout;
MAKE_CD_IN_AND_OUT(out_directory);
- //don't need the makefile arg if it isn't changed
- QString makefilein;
- if(subtarget->makefile != "$(MAKEFILE)")
- makefilein = " -f " + subtarget->makefile;
+ QString makefilein = " -f " + subtarget->makefile;
//write the rule/depends
if(flags & SubTargetOrdered) {