From 397e39eb4fb006dfc2fda80c482c03045f6a9ac9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 11 Jun 2014 11:07:20 -0700 Subject: 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 --- subsurface.pro | 7 ++++--- 1 file 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 -- cgit v1.2.3-70-g09d2