AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assign MAKEFILE even in non-subdirs Makefiles

Browse Source 
this is necessary for having a clean way to recurse even from leaf
makefiles.

the location where the variable is written in the makefile is somewhat
bizarre, but the code is so convoluted that finding a better place would
mean either a lot of duplication or a lot of prior refactoring.

Change-Id: I68e4cf7e3814f6c60b2e3421d69775c993dafb23
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-11-26 20:56:50 +01:00 committed by The Qt Project
parent 8c0787a8a9
commit 80b99a6dd7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/makefile.cpp
View File

@ -2192,6 +2192,11 @@ MakefileGenerator::writeStubMakefile(QTextStream &t)
bool bool
MakefileGenerator::writeMakefile(QTextStream &t) MakefileGenerator::writeMakefile(QTextStream &t)
{ {
QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
if (ofile.lastIndexOf(Option::dir_sep) != -1)
ofile.remove(0, ofile.lastIndexOf(Option::dir_sep) +1);
t << "MAKEFILE = " << ofile << endl << endl;
t << "####### Compile" << endl << endl; t << "####### Compile" << endl << endl;
writeObj(t, "SOURCES"); writeObj(t, "SOURCES");
writeObj(t, "GENERATED_SOURCES"); writeObj(t, "GENERATED_SOURCES");