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.

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 85e1292ab54760b780e6acfee39bae50ac1abe56..0164322b197d089d5e12733e572acdc961bf13ff 100644 (file)
--- 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 fcbc43420c5a25afe9b8820b6fc8655b3c50789c..bbad8bb3d22421330d24c7a47ddff5d64a45e010 100644 (file)
--- 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 9ab24607a3b40b80dd89f7a51e827e8ea5275231..c0a4ae3dd839b8c84107652d47a59d2e7571e74f 100644 (file)
--- 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 204b8ed12d5930fe7d3401116d8024d77cc3dc76..c6c809a1dec50c0dcf63fa5c28edcb007bb85474 100644 (file)
--- 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 e1c4427d44f4acf59a1bbd13325a38775b57fecb..c191c83a682a68dedb77a251b5e43b190b75f7c2 100644 (file)
--- 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 .