From 51e2a5a9ff4194fbebe7e989221053f96aa0213b Mon Sep 17 00:00:00 2001
From: Tommy Reynolds <Tommy.Reynolds@MegaCoder.com>
Date: Thu, 2 Mar 2006 01:50:06 +0000
Subject: Fixed depandancies so that ${LANG}/fdp-info.xml and
 ${LANG}/${DOC_ENTITIES}.ent both get built

---
 Makefile.common | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 0cd68b6..3212410 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -165,12 +165,19 @@ $(foreach L,${LANGUAGES},$(eval $(call XMLFILES_template,${L})))
 # Append per-document entities file if any
 ifneq	"${DOC_ENTITIES}" ""
 $(foreach L, ${LANGUAGES}, $(eval XMLFILES-${L}+=${L}/${DOC_ENTITIES}.xml))
+$(foreach L, ${LANGUAGES}, $(eval XMLDEPFILES-${L}+=${L}/${DOC_ENTITIES}.ent))
 endif
 
 $(foreach L, ${LANGUAGES},$(eval $(call XMLFILENAME_template,${L})))
 #
 #########################################################################
 
+#########################################################################
+# Define ${XMLDEPFILES-${LANG}} to be the list of non-archived dependant
+# files needed in addition to ${XMLFILES-${LANG}}.
+$(foreach L, ${LANGUAGES}, $(eval XMLDEPFILES-${L}+=${L}/fdp-info.xml))
+#########################################################################
+
 #########################################################################
 TFMT="%-31s -- %s\n"
 #########################################################################
@@ -237,7 +244,7 @@ distclean:: clean
 define	HTML_template
 .PHONY:	html-${1}
 html-$(1):: ${DOCBASE}-$(1)/index.html
-${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} $(1)/fdp-info.xml set-locale-${1}
+${DOCBASE}-$(1)/index.html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
 	LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(1)/$(DOCBASE).xml
 	mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
 	cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
@@ -272,7 +279,7 @@ define	HTMLNOCHUNK_template
 
 html-nochunks-$(1):: ${DOCBASE}-$(1).html
 
-${DOCBASE}-$(1).html:: ${XMLFILES-${1}} $(1)/fdp-info.xml set-locale-${1}
+${DOCBASE}-$(1).html:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
 	LANG=${1}.UTF-8 ${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(1)/$(DOCBASE).xml
 	mv $(DOCBASE).html $(DOCBASE)-$(1).html
 	mkdir -p stylesheet-images/
@@ -332,7 +339,7 @@ define	PDF_template
 
 pdf-$(1):: ${DOCBASE}-$(1).pdf
 
-${DOCBASE}-$(1).pdf:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
+${DOCBASE}-$(1).pdf:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
 	LANG=${1}.UTF-8 ${XMLTO} pdf -x $(XSLPDF) $(1)/$(DOCBASE).xml
 	mv -f ${DOCBASE}.pdf ${DOCBASE}-${1}.pdf
 
@@ -357,7 +364,7 @@ define  TXT_template
 
 txt-$(1) text-$(1):: ${DOCBASE}-$(1).txt
 
-${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${1}/fdp-info.xml set-locale-${1}
+${DOCBASE}-$(1).txt:: ${XMLFILES-${1}} ${XMLDEPFILES-${1}} set-locale-${1}
 	${XMLLINT} ${XMLLINTOPT} $(1)/$(DOCBASE).xml > $(1)/$(DOCBASE).lint.xml
 	${XSLTPROC} $(FDPDIR)/docs-common/packaging/strip-for-txt.xsl \
 		$(1)/$(DOCBASE).lint.xml > $(1)/$(DOCBASE).stripped.xml
-- 
cgit