diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-23 13:40:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-23 19:16:57 +0000 |
| commit | 3378aa45c27052510c244f935639d65bdf9275f4 (patch) | |
| tree | 2563f73c3933ff962572426ba7fa882d2b84fa50 /qmake | |
| parent | 6e2e0e061ff1974b35cd171e085b9920d770e7d9 (diff) | |
fix distclean targets
this makes the distclean targets work throughout qt.
the dreaded confclean target is aliased to distclean.
Task-number: QTBUG-8202
Task-number: QTBUG-20566
Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 873d65a97c..86f884fe20 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -123,9 +123,11 @@ clean:: distclean:: clean $(RM_RF) .deps $(RM_F) $(BUILD_PATH)/bin/qmake$(EXEEXT) + $(RM_F) Makefile depend: makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC) + $(RM_F) Makefile.bak ioutils.o: $(QMKLIBSRC)/ioutils.cpp diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index f84c30d4af..9dda6ca1e7 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -140,7 +140,9 @@ clean:: -del qmake.tds distclean:: clean - -del qmake + -del qmake.exe + -del $(BUILD_PATH)\bin\qmake.exe + -del Makefile .c.obj: $(CXX) $(CFLAGS) $< |