summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-06-11 11:07:20 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-06-11 11:09:24 -0700
commit397e39eb4fb006dfc2fda80c482c03045f6a9ac9 (patch)
tree438104a36d8238c1286306e81bc3dbe8519f4835
parentde6ee1f8a950cd6af24dfcb72888140d3e5be2f4 (diff)
downloadsubsurface-397e39eb4fb006dfc2fda80c482c03045f6a9ac9.tar.gz
Qmake: make clean failed on Windows cross builds
For some reason the docclean rule wasn't included in the Makefile when cross building for Windows on Linux. Doing some searching into the issue I found a much easier way to handle the make clean stage and sidestepped the actual problem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface.pro7
1 files changed, 4 insertions, 3 deletions
diff --git a/subsurface.pro b/subsurface.pro
index 98d436fbf..b2de572f0 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -242,11 +242,12 @@ USERMANUALS = \
doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation || $(MKDIR) $$OUT_PWD/Documentation $$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc
all.depends += usermanual
-docclean.commands += $(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation clean
usermanual.depends += doc
usermanual.target = $$OUT_PWD/Documentation/user-manual.html
-QMAKE_EXTRA_TARGETS += doc docclean usermanual all
-CLEAN_DEPS += docclean
+QMAKE_EXTRA_TARGETS += doc usermanual all
+# add the generated user manual HTML files to the list of files to remove
+# when running make clean
+for(MANUAL,USERMANUALS) QMAKE_CLEAN += $$OUT_PWD/Documentation/$$MANUAL
marbledata.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/marbledata || $(COPY_DIR) $$PWD/marbledata $$OUT_PWD
all.depends += marbledata