Build tweaks

diff --git a/docbook/relaxng/Makefile b/docbook/relaxng/Makefile
index 49f88fdd3b5ff525465c17134841c8b04b253f2d..66aa839abebb24577043bbf5006cd8d334539221 100644 (file)
--- a/docbook/relaxng/Makefile
+++ b/docbook/relaxng/Makefile
@@ -10,12 +10,34 @@ all: docbook.rng
 docbook.rng: $(RNCFILES)
        $(MAKE) -C build $@
 
+docbook-dtd.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+
 dbsmall.rng: $(RNCFILES)
        $(MAKE) -C build $@
 
 dbastro.rng: $(RNCFILES)
        $(MAKE) -C build $@
 
+sdocbook.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+       perl tools/trimgrammar.pl -o ,$@ $@
+       saxon ,$@ tools/trimgrammar.xsl $@ use.extensions=1
+
+slides-ng.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+       perl tools/trimgrammar.pl -o ,$@ $@
+       saxon ,$@ tools/trimgrammar.xsl $@ use.extensions=1
+
+website-ng.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+       perl tools/trimgrammar.pl -o ,$@ $@
+       saxon ,$@ tools/trimgrammar.xsl $@ use.extensions=1
+
+docbook.dtd: docbook-dtd.xml tools/doc2dtd.xsl
+       xsltproc --output $@ tools/doc2dtd.xsl $<
+       xjparse -d dtdtest.xml
+
 tests:
        mkdir -p tests tests/passed
        cd tests && ../tools/runtests
@@ -23,10 +45,17 @@ tests:
 html: docbook-rng.xml
        xsltproc tools/html.xsl $<
 
+shtml: sdocbook-rng.xml
+       xsltproc tools/html.xsl $<
+
 docbook-rng.xml: docbook.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
-       tools/makedoc $< $@
+       xsltproc -output $@ tools/rngdocxml.xsl $<
+
+docbook-dtd.xml: docbook-dtd.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
+       xsltproc -output $@ tools/rngdocxml.xsl $<
 
-#      xsltproc -output $@ tools/rngdocxml.xsl $<
+sdocbook-rng.xml: sdocbook.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
+       xsltproc -output $@ tools/rngdocxml.xsl $<
 
 clean:
        rm -f out*

diff --git a/docbook/relaxng/build/Makefile b/docbook/relaxng/build/Makefile
index d8f7bc1ad26009320b16a11bb4ac7e64d7aa2cc6..ae09cfce896521ca3f8bd67d2c89e751d9cae83f 100644 (file)
--- a/docbook/relaxng/build/Makefile
+++ b/docbook/relaxng/build/Makefile
@@ -2,7 +2,7 @@ VPATH=../src ../tests/customizations
 
 RNCFILES=$(subst ../src/,,$(wildcard ../src/*.rnc))
 RNXFILES=$(subst .rnc,.rnx,$(RNCFILES))
-MODULES=$(filter-out docbook.rnx,$(RNXFILES))
+MODULES=$(filter-out docbook.rnx,$(filter-out sdocbook.rnx,$(filter-out slides-ng.rnx,$(filter-out website-ng.rnx,$(RNXFILES)))))
 
 TMPDIR=/tmp/
 TMPFILE=$(TMPDIR)cleanup.rng
@@ -18,6 +18,8 @@ CLEANUP=../tools/cleanup.pl
 
 docbook.rng: docbook.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
 
+docbook-dtd.rng: docbook-dtd.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
 docbook.rnx: $(MODULES)
 
 dbsmall.rng: dbsmall.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
@@ -26,6 +28,12 @@ dbsmall.rnx: $(MODULES)
 
 dbastro.rng: dbastro.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
 
+sdocbook.rng: sdocbook.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
+slides-ng.rng: slides-ng.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
+website-ng.rng: website-ng.rnx $(AUGMENT) $(INCLUDE) $(CLEANUP)
+
 dbastro.rnx: $(MODULES)
 
 .rnx.rng: