diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-12 17:45:55 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-13 08:59:43 +1000 |
| commit | 152a10012ce3582ee64d38eca991aae975cffd24 (patch) | |
| tree | 47a2dab9cba0f414bdf2a84613bf1c21ac5e2acd /qmake | |
| parent | 1a1471718d6c99a52211ab060f3627c2478bb738 (diff) | |
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
(cherry picked from commit 96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index ace3531374..94661a8205 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2647,10 +2647,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) { |