From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sat, 6 Oct 2007 04:49:13 +0000 (+0000)
Subject: Ensure that docs get rebuilt as expected when changes are made to
X-Git-Tag: release/1.79.1~6^2~1634
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40b2cc86c482e106e6d1864a6bb11ecfa62199b8;p=docbook-dsssl

Ensure that docs get rebuilt as expected when changes are made to
param and pi source files and to other doc source files.
---

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 0e6eaf8fe..286fa23f3 100644
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -19,6 +19,15 @@ GZIPFLAGS=
 
 HTMLMANIFEST=HTML.manifest
 
+PARAM_DIRS=html fo manpages roundtrip slides/fo slides/html website
+PI_DIRS=html fo common
+
+PARAM_XML_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xml)
+PI_XML_FILES=$(foreach format,$(PI_DIRS),../$(format)/pi.xml)
+OTHER_XML_FILES=../common/common.xml ../common/utility.xml ../common/refentry.xml ../common/charmap.xml ../template/titlepage.xml ../fo/table.xml
+
+DOC_SOURCE_XML_FILES=$(PARAM_XML_FILES) $(PI_XML_FILES) $(OTHER_XML_FILES)
+
 DIRS=common fo html lib manpages pi refentry roundtrip slides template utility website
 
 .PHONY : clean
@@ -38,7 +47,7 @@ else
 all: fo/page.png reference.html reference.css reference.txt.gz
 endif
 
-index.html: ../docsrc/reference.xml.included $(RSTYLE)
+index.html: ../docsrc/reference.xml.included $(RSTYLE) $(DOC_SOURCE_XML_FILES)
 	$(XSLT) $< $(RSTYLE)
 
 reference.html: index.html
@@ -48,13 +57,13 @@ reference.css: ../docsrc/reference.css
 	cp -p $< .
 	for dir in $(DIRS); do cp -p $< $$dir; done
 
-reference.fo: ../docsrc/reference.xml.included $(REFERENCEFOXSL) fo/page.png
+reference.fo: ../docsrc/reference.xml.included $(REFERENCEFOXSL) fo/page.png $(DOC_SOURCE_XML_FILES)
 	$(DOCBOOK_SVN)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
 	$(XEP) $(XEPFLAGS) $<
 
-reference.txt.html: ../docsrc/reference.xml.included $(REFERENCETXTXSL)
+reference.txt.html: ../docsrc/reference.xml.included $(REFERENCETXTXSL) $(DOC_SOURCE_XML_FILES)
 	$(XSLT) $< $(REFERENCETXTXSL) > $@
 
 reference.txt: reference.txt.html
diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 66664c908..70acc58d7 100644
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -15,11 +15,11 @@ PI_XSL_FILES=$(foreach format,$(PI_DIRS),../$(format)/pi.xsl)
 
 all: $(PARAM_XML_FILES) ../lib/lib.xml $(PI_XML_FILES) $(OTHER_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS) $(XSL_PI)
 
-../%/param.xml:
+../%/param.xml: ../%/param.xsl
 	$(MAKE) -C $(dir $@) param.xml
 
-../lib/lib.xml:
-	$(MAKE) -C $(dir $@) lib.xml
+../lib/lib.xml: ../lib/lib.xsl
+	$(MAKE) -C ../lib lib.xml
 
 %.xml: %.xsl
 	$(XSLT) $< $(XSL2JREF) /dev/null output-file=$@.tmp