From 306d4c679433be7e357854dd3d97c71163c6d5c0 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 29 Aug 2017 20:55:16 +0000 Subject: qmake: fixed 'make distclean' target git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7423 90c681e8-e032-0410-971d-27865f9a5e38 --- qmmp.pri | 5 +---- qmmp.pro | 8 +++++++- src/qmmp/qmmp.pro | 1 + src/qmmpui/qmmpui.pro | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/qmmp.pri b/qmmp.pri index 3db1a5b96..f998ff583 100644 --- a/qmmp.pri +++ b/qmmp.pri @@ -2,10 +2,7 @@ #Extra clean target -unix { - QMAKE_DISTCLEAN += -r .build - QMAKE_DISTCLEAN += translations/*.qm -} +unix: QMAKE_DISTCLEAN += -r .build #Some conf to redirect intermediate stuff in separate dirs diff --git a/qmmp.pro b/qmmp.pro index e6439283a..19e80d706 100644 --- a/qmmp.pro +++ b/qmmp.pro @@ -28,7 +28,13 @@ message(Found lrelease executable: $$LRELEASE_EXECUTABLE) } message(generating translations) -unix:system(find . -name *.ts | xargs $$LRELEASE_EXECUTABLE -compress) + +unix { + system(find . -name *.ts | xargs $$LRELEASE_EXECUTABLE -compress) + QMAKE_DISTCLEAN += $$system(find . -name *.qm) + QMAKE_DISTCLEAN += r lib +} + win32:system(for /r %B in (*.ts) do $$LRELEASE_EXECUTABLE -compress %B) message("******* BUILD CONFIGURATION *******") diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index 8e3af1503..ff623ed6b 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -150,4 +150,5 @@ unix { QMAKE_PKGCONFIG_DESCRIPTION = qmmp core library QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_DISTCLEAN += -r pkgconfig } diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro index 7278445b8..636371339 100644 --- a/src/qmmpui/qmmpui.pro +++ b/src/qmmpui/qmmpui.pro @@ -181,4 +181,5 @@ unix { QMAKE_PKGCONFIG_DESCRIPTION = qmmp user interface library QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork qmmp QMAKE_PKGCONFIG_DESTDIR = pkgconfig + QMAKE_DISTCLEAN += -r pkgconfig } -- cgit v1.2.3-13-gbd6f