[gimp-help-2: 1/3] Fix some minor Makefile bugs



commit f8e0bf2bc3022683d03765a51e981f884db6026e
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Jul 9 19:03:17 2009 +0200

    Fix some minor Makefile bugs
    
    * Don't echo the xsltproc command by default when making html.
    * Prevent 'make' from trying to remove "xml/*/images"
      (which always fails and thus produces an error message).

 Makefile.GNU |    4 +++-
 Makefile.am  |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index 07b5921..9c8fe00 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -481,6 +481,8 @@ cleanup-xml-%:
 # Target suitable for command line
 xml-en: cleanup-xml-en xml/en $(en_XML_FILES) ;
 
+.PRECIOUS: xml/%/images
+
 .PHONY: FORCE
 FORCE: ;
 
@@ -536,7 +538,7 @@ html/%/index.html: xml/% $(HTML_STYLESHEETS) html/%/images
 	$(msg) "*** Making html for $* ... "
 	$(cmd) rm -f html/$*/*.*
 
-	$(XSLTPROC) \
+	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \
 	  --xinclude \
 	  --stringparam l10n.gentext.default.language $* \
diff --git a/Makefile.am b/Makefile.am
index f0d85a9..93dfbf8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -559,7 +559,7 @@ html/%/index.html: xml/% $(HTML_STYLESHEETS) html/%/images
 	$(msg) "*** Making html for $* ... "
 	$(cmd) rm -f html/$*/*.*
 
-	$(XSLTPROC) \
+	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \
 	  --xinclude \
 	  --stringparam l10n.gentext.default.language $* \
@@ -880,9 +880,10 @@ $(top_srcdir)/configure: $(top_srcdir)/configure.ac ;
 
 # GNU Make, please don't delete these targets when a target that depends
 # on them fails, 'kay?
-#
+#			TODO: check: seems that xml/%/gimp.xml can be removed
 .PRECIOUS: \
 	xml/%/gimp.xml \
+	xml/%/images \
 	pdf/%/gimp.pdf \
 	odf/%/gimp.odt \
 	html/%/gimp-xrefs.xml \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]