Lots of tweaks

diff --git a/docbook/relaxng/Makefile b/docbook/relaxng/Makefile
index ca8d633d15da9023f5026fbe634105096e525f3e..a648d2746bbd8986fab303b1daa4408470848eaf 100644 (file)
--- a/docbook/relaxng/Makefile
+++ b/docbook/relaxng/Makefile
@@ -1,32 +1,32 @@
+VPATH=src
+
 .SUFFIXES: .rnc .rng .rnx
-.PHONY: docbook.rng tests
+.PHONY: tests html
+
+RNCFILES=$(subst $(VPATH)/,,$(wildcard $(VPATH)/*.rnc))
 
 all: docbook.rng
 
-docbook.rng:
+docbook.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+
+dbsmall.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+
+dbastro.rng: $(RNCFILES)
        $(MAKE) -C build $@
-       cp build/$@ .
 
 tests:
        mkdir -p tests tests/passed
        cd tests && ../tools/runtests
 
-db5doc.xml: docbook.rng \
-            tools/group.xsl tools/expand.xsl tools/flatten.xsl tools/classify.xsl
-       xsltproc -output /tmp/gr1.xml  tools/group.xsl    $<
-       xsltproc -output /tmp/out1.xml tools/expand.xsl   /tmp/gr1.xml
-       xsltproc -output /tmp/out2.xml tools/expand.xsl   /tmp/out1.xml
-       xsltproc -output /tmp/out3.xml tools/expand.xsl   /tmp/out2.xml
-       xsltproc -output /tmp/out4.xml tools/expand.xsl   /tmp/out3.xml
-       xsltproc -output /tmp/out5.xml tools/expand.xsl   /tmp/out4.xml
-       xsltproc -output /tmp/out6.xml tools/classify.xsl /tmp/out5.xml
-       xsltproc -output /tmp/out7.xml tools/flatten.xsl     /tmp/out6.xml
-       xsltproc -output /tmp/out8.xml tools/flatten.xsl     /tmp/out7.xml
-       xsltproc -output $@ tools/flatten.xsl     /tmp/out8.xml
-       cp $@ /sourceforge/docbook/defguide/en/build/lib/
-
-out.html: db5doc.xml
-       saxon $< tools/html.xsl $@
+html: docbook-rng.xml
+       xsltproc tools/html.xsl $<
+
+docbook-rng.xml: docbook.rng tools/rngdocxml.xsl
+       tools/makedoc $< $@
+
+#      xsltproc -output $@ tools/rngdocxml.xsl $<
 
 clean:
        rm -f out*

diff --git a/docbook/relaxng/build/Makefile b/docbook/relaxng/build/Makefile
index 559c335b68c9ebf8be36da40b7aa8438933d0fa1..5c32afe27942d85289decb6886199dbde104a1c4 100644 (file)
--- a/docbook/relaxng/build/Makefile
+++ b/docbook/relaxng/build/Makefile
@@ -1,4 +1,8 @@
-VPATH=../src
+VPATH=../src ../tests/customizations
+
+RNCFILES=$(subst $(VPATH)/,,$(wildcard $(VPATH)/*.rnc))
+RNXFILES=$(subst .rnc,.rnx,$(RNCFILES))
+MODULES=$(filter-out docbook.rnx,$(RNXFILES))
 
 TMPDIR=/tmp/
 TMPFILE=$(TMPDIR)cleanup.rng
@@ -12,17 +16,25 @@ CLEANUP=../tools/cleanup.pl
 
 .SUFFIXES: .rnc .rng .rnx
 
-all: docbook.rng
+docbook.rng: docbook.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
+docbook.rnx: $(MODULES)
+
+dbsmall.rng: dbsmall.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
 
-docbook.rng: docbook.rnx hier.rnx pool.rnx calstbl.rnx htmltbl.rnx callouts.rnx \
-             ebnf.rnx svg.rnx mathml.rnx msgset.rnx htmlform.rnx refentry.rnx \
-             tasks.rnx \
-            $(AUGMENT) $(INCLUDE) $(CLEANUP)
+dbsmall.rnx: $(MODULES)
+
+dbastro.rng: dbastro.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
+dbastro.rnx: $(MODULES)
 
 .rnx.rng:
-       saxon $< $(INCLUDE) $(TMPFILE) use.extensions=1
-       saxon $(TMPFILE) $(AUGMENT) $@ use.extensions=1
+       saxon $< $(INCLUDE) ,$@ use.extensions=1
+       saxon ,$@ $(AUGMENT) $@ use.extensions=1
        perl -i $(CLEANUP) $@
+       cp $@ ..
+
+#      rm -f ,$@
 
 .rnc.rnx:
        trang -O rng $< $@