From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sat, 2 Sep 2006 03:11:32 +0000 (+0000)
Subject: Make the doc build depend on docsrc.
X-Git-Tag: release/1.79.1~6^2~2560
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eecfa78040a479a084dc58f7544d047e17ba533b;p=docbook-dsssl

Make the doc build depend on docsrc.
---

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 9bc163b04..15c6d516c 100644
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -21,13 +21,20 @@ VPATH=../docsrc
 
 DIRS=common refentry lib html fo manpages wordml slides website template pi
 
-all: copyright.html warranty.html reference.html index.html reference.txt.gz
+all: html reference.txt.gz
+
+html: base copyright.html warranty.html reference.html index.html
+
+base: docsrc
 	for i in $(DIRS) __bogus__; do \
 		if [ $$i != __bogus__ ] ; then \
 			echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
 		fi \
 	done
 
+docsrc:
+	$(MAKE) -C ../docsrc
+
 copyright.html: copyright.xml $(RSTYLE)
 	$(XJPARSE) $(VPATH)/$<
 	$(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
@@ -43,11 +50,11 @@ reference.html: reference.xml $(RSTYLE)
 index.html: reference.html
 	cp -pR $< $@
 
-reference.pdf: ../docsrc/reference.dbk $(REFERENCE_MAKEFILE)
+reference.pdf: ../docsrc/reference.dbk docsrc $(REFERENCE_MAKEFILE)
 	$(MAKE) -f $(REFERENCE_MAKEFILE) ../docsrc/reference.pdf PDF_MAKER=$(PDF_MAKER) DOCBOOK_FILE_EXTENSION=$(DOCBOOK_FILE_EXTENSION) FO_PARAMS=$(FO_PARAMS) \
 	  && mv ../docsrc/reference.pdf .
 
-reference.txt: ../docsrc/reference.dbk $(REFERENCE_MAKEFILE)
+reference.txt: ../docsrc/reference.dbk docsrc $(REFERENCE_MAKEFILE)
 	$(MAKE) -f $(REFERENCE_MAKEFILE) ../docsrc/reference.txt TXT_MAKER=$(TXT_MAKER) TXT_MAKER_FLAGS=$(TXT_MAKER_FLAGS) DOCBOOK_FILE_EXTENSION=$(DOCBOOK_FILE_EXTENSION) HTML_PARAMS=$(HTML_PARAMS) \
 	  && mv ../docsrc/reference.txt . && $(RM) ../docsrc/reference.html
 
@@ -64,9 +71,6 @@ clean:
 			echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
 		fi \
 	done
-	$(RM) ../docsrc/reference.fo
-	$(RM) ../docsrc/reference.pdf
-	$(RM) ../docsrc/reference.txt
 	$(RM) reference.pdf
 	$(RM) reference.txt
 	$(RM) reference.pdf.gz
diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 1eddc1e9f..a6709d33d 100644
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -8,7 +8,9 @@ PARAM_XSL_FILES=$(shell for file in $$(find . -name "param.xsl"); do \
 MAKE_ELEMENTS_XSL=make-elements.xsl
 MAKE_PARAMS_XSL=make-xsl-params.xsl
 
-all: docbook-elements.xsl xsl-params.xsl
+all: base docbook-elements.xsl xsl-params.xsl
+
+base:
 	for i in $(DIRS) __bogus__; do \
 		if [ $$i != __bogus__ ] ; then \
 			echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
@@ -21,6 +23,10 @@ clean:
 			echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
 		fi \
 	done
+	$(RM) reference.txt
+	$(RM) reference.html
+	$(RM) reference.fo
+	$(RM) reference.pdf
 
 $(DOCBOOK5_RNG):
 	$(MAKE) -C $(dir $@) $(notdir $@)