Misc. cleanup in preparation for making a distrib

diff --git a/xsl/.cvsignore b/xsl/.cvsignore
new file mode 100644 (file)
index 0000000..01eed1b
--- /dev/null
+++ b/xsl/.cvsignore
@@ -0,0 +1 @@
+WhatsNew

diff --git a/xsl/Makefile b/xsl/Makefile
index aa2c45cf419ed10f6647740d75cd1c3cd1670d71..a5dd86bce964201eb93a7931db60e90a23bde9b1 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -1,30 +1,34 @@
+CVS2LOG=../cvstools/cvs2log
+MERGELOGS=../cvstools/mergechangelogs
+NEXTVER=../cvstools/nextversion
 DIFFVER=
 
+DIRS=common html fo extensions
+
 .PHONY : distrib clean doc
 
 all:
-       cd common; make
-       cd html; make
-       cd fo; make
-       cd extensions; make
+       for i in $(DIRS) __bogus__; do \
+               if [ $$i != __bogus__ ] ; then \
+                       echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
+               fi \
+       done
 
 doc:
-       cd docsrc; make
-       cd doc; make
+       $(MAKE) -C docsrc
+       $(MAKE) -C doc
 
 distrib: all doc
-       dbin/cvs2log -w
+       $(CVS2LOG) -w
 ifeq ($(DIFFVER),)
-       dbin/mergechangelogs > WhatsNew
+       $(MERGELOGS) > WhatsNew
 else
-       dbin/mergechangelogs -v $(DIFFVER) > WhatsNew
+       $(MERGELOGS) -v $(DIFFVER) > WhatsNew
 endif
 
 newversion:
-       dbin/nextversion
+       $(NEXTVER)
        make DIFFVER=$(DIFFVER) distrib
 
 clean:
-       cd doc; make clean
-       cd test; make clean
-
+       $(MAKE) -C doc clean

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index bb97b82b53e05a1fe48c2ce959518098c354524a..8b42cf38ff7c81ee3f7cc8224795be89d04c3e58 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -1,3 +1,6 @@
+XSLT=../../cvstools/saxon
+XJPARSE=../../cvstools/xjparse
+
 .PHONY : clean
 
 RSTYLE=reference.xsl
@@ -5,29 +8,37 @@ BSTYLE=book.xsl
 VPATH=../docsrc
 SAXVER=-6
 
+DIRS=common lib html fo
+
 all: copyright.html warranty.html reference.html index.html
-       cd common; make
-       cd lib; make
-       cd html; make
-       cd fo; make
+       for i in $(DIRS) __bogus__; do \
+               if [ $$i != __bogus__ ] ; then \
+                       echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
+               fi \
+       done
 
 copyright.html: copyright.xml $(RSTYLE)
-       xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
-       saxon $(SAXVER) $< $(RSTYLE) $@
+       $(XJPARSE) $(VPATH)/$<
+       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
 
 warranty.html: warranty.xml $(RSTYLE)
-       xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
-       saxon $(SAXVER) $< $(RSTYLE) $@
+       $(XJPARSE) $(VPATH)/$<
+       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
 
 reference.html: reference.xml $(RSTYLE) lib/lib.xml common/common.xml \
                html/param.xml html/ebnf.xml \
                fo/param.xml fo/table.xml
-       xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
-       saxon $(SAXVER) $< $(RSTYLE) $@
+       $(XJPARSE) $(VPATH)/$<
+       $(XSLT) $(SAXVER) $< $(RSTYLE) $@
 
 index.html: documentation.xml $(BSTYLE) reference.xml
-       xnsgmls -sv -E 5 -c /share/doctypes/catalog $(VPATH)/$<
-       saxon $(SAXVER) $< $(BSTYLE) $@
+       $(XJPARSE) $(VPATH)/$<
+       $(XSLT) $(SAXVER) $< $(BSTYLE) $@
 
 clean:
-       rm -f *.html common/*.html lib/*.html html/*.html fo/*.html
+       rm -f *.html
+       for i in $(DIRS) __bogus__; do \
+               if [ $$i != __bogus__ ] ; then \
+                       echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
+               fi \
+       done