Em dom 08 jun 2014, às 07:27:47, Dirk Hohndel escreveu:
> Thiago, there are two things with qmake where I need help:
>
> a) make clean should make clean in Documentation
Patch attached.
It's a matter of adding a target to CLEAN_DEPS.
> b) on the Mac the user-manual.html in the bundle depends on the
> user-manual.html in Documentation (and the same for the Spanish version).
> Yet nothing in the Makefile tells make that user-manual*.html can be
> created by running make doc
>
> So on Linux, when you run make, it sees the
> all: doc
> dependency and runs make doc which creates the html files.
>
> But on Mac, when scanning its dependencies, it sees that it needs
> Documentation/user-manual*.html for the corresponding files in the bundle
> and then aborts complaining that it doesn't know how to make them.
>
> I tried a dozen different ways to tell it to just run make doc to create
> those user-manual*.html files but none of them had any effect.
>
> qmake documentation is really extremely weak.
>
> Can you help?
This one I'll need to ssh into my Mac to take a look and test. We might be
able to trick qmake into adding the dependency by adding a new target to
QMAKE_EXTRA_TARGETS, with the target's name equal to the expected file name.
--
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
Software Architect - Intel Open Source Technology Center
PGP/GPG: 0x6EF45358; fingerprint:
E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358
>From 22a46ac45b28074415b2e45ba5d10a1eb15871f1 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <[email protected]>
Date: Sun, 8 Jun 2014 13:13:15 -0400
Subject: [PATCH 1/1] Make make clean also clean in the doc subdir
Signed-off-by: Thiago Macieira <[email protected]>
---
subsurface.pro | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/subsurface.pro b/subsurface.pro
index 829a459..f473070 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -237,7 +237,9 @@ planner: ENABLE_PLANNER=1
else: ENABLE_PLANNER=0
doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation || $(MKDIR) $$OUT_PWD/Documentation $$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ ENABLE_PLANNER=$$ENABLE_PLANNER doc
all.depends += doc
-QMAKE_EXTRA_TARGETS += doc all
+docclean.commands += $(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation ENABLE_PLANNER=$$ENABLE_PLANNER clean
+QMAKE_EXTRA_TARGETS += doc docclean all
+CLEAN_DEPS += docclean
marbledata.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/marbledata || $(COPY_DIR) $$PWD/marbledata $$OUT_PWD
all.depends += marbledata
@@ -278,3 +280,6 @@ OTHER_FILES += $$DESKTOPFILE $$ICON $$MANPAGE $$XSLT_FILES $$DOC_FILES $$MARBLED
include(subsurface-gen-version.pri)
include(subsurface-install.pri)
+
+#QMAKE_CFLAGS_RELEASE=$$QMAKE_CFLAGS_DEBUG
+#QMAKE_CXXFLAGS_RELEASE=$$QMAKE_CXXFLAGS_DEBUG
--
1.8.4.5
_______________________________________________
subsurface mailing list
[email protected]
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
