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

qmake: Add DISTCLEAN_DEPS variable

Browse Source 
This variable works like CLEAN_DEPS, but applies to the distclean target.

Change-Id: Ia30e8932b9acd6529298728dd5d0e038b0208d66
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Andrew Knight 2014-01-29 16:19:51 +02:00 committed by The Qt Project
parent 8e1cc7043f
commit 604849018d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -2617,6 +2617,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
t << varGlue("ALL_DEPS"," "," ",""); t << varGlue("ALL_DEPS"," "," ","");
if(suffix == "clean") if(suffix == "clean")
t << varGlue("CLEAN_DEPS"," "," ",""); t << varGlue("CLEAN_DEPS"," "," ","");
else if (suffix == "distclean")
t << varGlue("DISTCLEAN_DEPS"," "," ","");
t << " FORCE\n"; t << " FORCE\n";
if(suffix == "clean") { if(suffix == "clean") {
t << fileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n"); t << fileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n");

2
qmake/generators/unix/unixmake2.cpp
View File

@ -908,7 +908,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
ProString destdir = project->first("DESTDIR"); ProString destdir = project->first("DESTDIR");
if (!destdir.isEmpty() && !destdir.endsWith(Option::dir_sep)) if (!destdir.isEmpty() && !destdir.endsWith(Option::dir_sep))
destdir += Option::dir_sep; destdir += Option::dir_sep;
t << "distclean: clean\n"; t << "distclean: clean " << var("DISTCLEAN_DEPS") << '\n';
if(!project->isEmpty("QMAKE_BUNDLE")) { if(!project->isEmpty("QMAKE_BUNDLE")) {
QString bundlePath = escapeFilePath(destdir + project->first("QMAKE_BUNDLE")); QString bundlePath = escapeFilePath(destdir + project->first("QMAKE_BUNDLE"));
t << "\t-$(DEL_FILE) -r " << bundlePath << endl; t << "\t-$(DEL_FILE) -r " << bundlePath << endl;

2
qmake/generators/win32/winmakefile.cpp
View File

@ -565,7 +565,7 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
} }
t << endl << endl; t << endl << endl;
t << "distclean: clean"; t << "distclean: clean " << var("DISTCLEAN_DEPS");
{ {
const char *clean_targets[] = { "QMAKE_DISTCLEAN", 0 }; const char *clean_targets[] = { "QMAKE_DISTCLEAN", 0 };
for(int i = 0; clean_targets[i]; ++i) { for(int i = 0; clean_targets[i]; ++i) {