1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Makefile subtargets

Browse Source 
Commit c04b7a55d131006cf1061f3456f4c63a7436801e broke subtargets
so every rule would just make 'first' (implicitly)
This commit is contained in:
Marius Storm-Olsen 2011-05-07 03:19:51 +00:00
parent 4135b6b323
commit 9fe4482de1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -2527,7 +2527,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
t << " " << targets.at(target-1)->target << "-" << targetSuffixes.at(suffix) << "-ordered "; t << " " << targets.at(target-1)->target << "-" << targetSuffixes.at(suffix) << "-ordered ";
if(project->isEmpty("QMAKE_NOFORCE")) if(project->isEmpty("QMAKE_NOFORCE"))
t << " FORCE"; t << " FORCE";
writeSubMakeCall(t, out_directory_cdin, makefilein, out_directory_cdout); writeSubMakeCall(t, out_directory_cdin, makefilein + " " + s, out_directory_cdout);
} }
t << subtarget->target << "-" << targetSuffixes.at(suffix) << ": " << mkfile; t << subtarget->target << "-" << targetSuffixes.at(suffix) << ": " << mkfile;
if(!subtarget->depends.isEmpty()) if(!subtarget->depends.isEmpty())
@ -2535,7 +2535,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
"-"+targetSuffixes.at(suffix)); "-"+targetSuffixes.at(suffix));
if(project->isEmpty("QMAKE_NOFORCE")) if(project->isEmpty("QMAKE_NOFORCE"))
t << " FORCE"; t << " FORCE";
writeSubMakeCall(t, out_directory_cdin, makefilein, out_directory_cdout); writeSubMakeCall(t, out_directory_cdin, makefilein + " " + s, out_directory_cdout);
} }
} }
t << endl; t << endl;