[gimp-help-2: 2/7] [make] Fix PDF prerequisites

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit b32d167cddafa40312685613f6d4a3730682ca74
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Aug 13 10:37:57 2009 +0200

    [make] Fix PDF prerequisites
    
    The pdf manual will be rebuilt if any xml file is changed;
    xml files are automatically updated.

 Makefile.GNU |    7 ++++---
 Makefile.am  |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index c531c1d..d239bb7 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -454,7 +454,7 @@ xml/$(1)/%.xml:
 	pofile=po/$(1)/$$$${stem}.po; \
 	$(call po2xml,$$$${srcfile},$$$${pofile},$(1),$$@)
 
-# This is indirectly used as HTML prerequisite:
+# This is indirectly used as HTML and PDF prerequisite:
 xml/$(1): $$($(1)_XML_FILES)
 	$$(cmd) test -d $$@ && touch $$@ || $(mkdir_p) $$@
 
@@ -651,13 +651,14 @@ pdf: $(foreach lang,$(LANGUAGES),pdf-$(lang)) ;
 pdf-%: pdf/%/gimp.pdf ;
 
 # TODO: images (--fig-path option?); prerequisites
-pdf/%/gimp.pdf: xml/%/gimp.xml stylesheets/plainprint.xsl xml/%/images
+pdf/%/gimp.pdf: xml/% stylesheets/plainprint.xsl xml/%/images
 	$(cmd) if test -f pdf/%.pdf; then rm -f pdf/%.pdf; fi
 	$(cmd) test -d pdf/$* || $(mkdir_p) pdf/$*
 	$(msg) "*** Making PDF ($*) ..."
 	$(cmd) $(DBLATEX) $(DBLATEXFLAGS) $(DBLATEXEXTRAFLAGS) \
 	    --xsl-user=$(srcdir)/stylesheets/plainprint.xsl \
-	    --output=$@ $<
+	    --output=$@ \
+	    xml/$*/gimp.xml
 
 .PRECIOUS: pdf/%/gimp.pdf
 
diff --git a/Makefile.am b/Makefile.am
index 5d9e548..06ea3c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,7 +475,7 @@ include $(foreach LANG,$(PO_LANGS),xml/$(LANG)/.deps.mk)
 # HIDE FROM AUTOMAKE #	pofile=$$(srcdir)/po/$(1)/$$$${stem}.po; \
 # HIDE FROM AUTOMAKE #	$(call po2xml,$$$${srcfile},$$$${pofile},$(1),$$@)
 # HIDE FROM AUTOMAKE #
-# HIDE FROM AUTOMAKE ## This is indirectly used as HTML prerequisite:
+# HIDE FROM AUTOMAKE ## This is indirectly used as HTML and PDF prerequisite:
 # HIDE FROM AUTOMAKE #xml/$(1): $$($(1)_XML_FILES)
 # HIDE FROM AUTOMAKE #	$$(cmd) test -d $$@ && touch $$@ || $(mkdir_p) $$@
 # HIDE FROM AUTOMAKE #
@@ -626,13 +626,14 @@ pdf-local: $(foreach lang,$(LANGUAGES),pdf-$(lang)) ;
 pdf-%: pdf/%/gimp.pdf ;
 
 # TODO: images (--fig-path option?); prerequisites
-pdf/%/gimp.pdf: xml/%/gimp.xml stylesheets/plainprint.xsl xml/%/images
+pdf/%/gimp.pdf: xml/% stylesheets/plainprint.xsl xml/%/images
 	$(cmd) if test -f pdf/%.pdf; then rm -f pdf/%.pdf; fi
 	$(cmd) test -d pdf/$* || $(MKDIR_P) pdf/$*
 	$(msg) "*** Making PDF ($*) ..."
 	$(cmd) $(DBLATEX) $(DBLATEXFLAGS) $(DBLATEXEXTRAFLAGS) \
 	    --xsl-user=$(srcdir)/stylesheets/plainprint.xsl \
-	    --output=$@ $<
+	    --output=$@ \
+	    xml/$*/gimp.xml
 
 else