From 90db4e4365c543dbf098cca7f5329e349c80b5d1 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 17 Jun 2005 03:46:44 +0000
Subject: [PATCH] Refined doc build.

  - Changed makefiles in docsrc/fo, docsrc/html, and
    docsrc/manpages dirs to depend on corresponding params.xsl
    instead of on param.xweb. Rationale is that param.xsl gets
    rebuilt any time param.xweb changes. In addition, param.xsl
    gets rebuild any time any included params/*.xml file is
    changed. So making docsrc/* builds depend on param.xsl
    effectively makes them depend on both the param.xweb changes
    on on the actual param changes.

  - Changed doc/Makefile so that reference.html is rebuilt only
    when docsrc/reference.xml changes, not when any of its
    included files change. Rationale is that, because we chunk
    output for the doc build, reference.html is simply a sort of
    TOC page that doesn't need to get remade if the included files
    change. Because output of those included files goes to
    separate fo, html, and manpages subdirs, and that output gets
    generated by seperate make targets.
---
 xsl/doc/Makefile             | 5 +----
 xsl/docsrc/Makefile          | 4 +---
 xsl/docsrc/fo/Makefile       | 4 ++--
 xsl/docsrc/html/Makefile     | 4 ++--
 xsl/docsrc/manpages/Makefile | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 85e1292ab..0164322b1 100644
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -26,10 +26,7 @@ warranty.html: warranty.xml $(RSTYLE)
 	$(XJPARSE) $(VPATH)/$<
 	$(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
-reference.html: reference.xml $(RSTYLE) ../lib/lib.xml common/common.xml \
-		html/param.xml \
-		fo/param.xml fo/table.xml \
-		manpages/param.xml
+reference.html: reference.xml $(RSTYLE)
 	$(XJPARSE) $(VPATH)/$<
 	$(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT)
 
diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index fcbc43420..bbad8bb3d 100644
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,8 +1,6 @@
 DIRS=common html fo manpages template tools pi
 
-PARAMS=$(shell find ../params/*.xml)
-
-all: xsl-params.xsl $(PARAMS)
+all: xsl-params.xsl
 	for i in $(DIRS) __bogus__; do \
 		if [ $$i != __bogus__ ] ; then \
 			echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
diff --git a/xsl/docsrc/fo/Makefile b/xsl/docsrc/fo/Makefile
index 9ab24607a..c0a4ae3dd 100644
--- a/xsl/docsrc/fo/Makefile
+++ b/xsl/docsrc/fo/Makefile
@@ -9,12 +9,12 @@ XMLFILES = param.xml table.xml
 all: $(XMLFILES)
 
 clean:
-	rm -f $(XMLFILES)
+	$(RM) $(XMLFILES)
 
 %.xml : %.xsl $(JSTYLE)
 	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
 	$(XJPARSE) $@
 
-param.xml: param.xweb
+param.xml: ../../fo/param.xsl
 	$(MAKE) -C ../../fo param.xml
 	cp ../../fo/param.xml .
diff --git a/xsl/docsrc/html/Makefile b/xsl/docsrc/html/Makefile
index 204b8ed12..c6c809a1d 100644
--- a/xsl/docsrc/html/Makefile
+++ b/xsl/docsrc/html/Makefile
@@ -9,12 +9,12 @@ XMLFILES = param.xml
 all: $(XMLFILES)
 
 clean:
-	rm -f $(XMLFILES)
+	$(RM) $(XMLFILES)
 
 %.xml : %.xsl $(JSTYLE)
 	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
 	$(XJPARSE) $@
 
-param.xml: param.xweb
+param.xml: ../../html/param.xsl
 	$(MAKE) -C ../../html param.xml
 	cp ../../html/param.xml .
diff --git a/xsl/docsrc/manpages/Makefile b/xsl/docsrc/manpages/Makefile
index e1c4427d4..c191c83a6 100644
--- a/xsl/docsrc/manpages/Makefile
+++ b/xsl/docsrc/manpages/Makefile
@@ -15,6 +15,6 @@ clean:
 	$(XSLT) $< $(JSTYLE) /dev/null output-file=$@
 	$(XJPARSE) $@
 
-param.xml: param.xweb
+param.xml: ../../manpages/param.xsl
 	$(MAKE) -C ../../manpages param.xml
 	cp ../../manpages/param.xml .
-- 
2.40.0