Cleanup

diff --git a/docbook/relaxng/Makefile b/docbook/relaxng/Makefile
index c054acdeb553f90bbb4e624f2dff01028206de61..c4bcbe6775b4a7f9e424db40feef4683449f5bba 100644 (file)
--- a/docbook/relaxng/Makefile
+++ b/docbook/relaxng/Makefile
@@ -5,57 +5,30 @@ VPATH=src
 
 RNCFILES=$(subst $(VPATH)/,,$(wildcard $(VPATH)/*.rnc))
 
-all: docbook.rng
+all: docbook.rng docbook.dtd
 
-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 ,$@ build/$@
-       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
 
-html: docbook-rng.xml
-       xsltproc tools/html.xsl $<
+# ============================================================
 
-shtml: sdocbook-rng.xml
-       xsltproc tools/html.xsl $<
+docbook.rng: $(RNCFILES)
+       $(MAKE) -C build $@
+       trang $@ docbook.rnc
 
-docbook-rng.xml: docbook.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
+docbook-rng.xml: docbook.rng tools/rngdocxml.xsl
        xsltproc -output $@ tools/rngdocxml.xsl $<
 
-docbook-dtd.xml: docbook-dtd.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
-       xsltproc -output $@ tools/rngdocxml.xsl $<
+docbook-dtd.xml: docbook-rng.xml tools/doc2dtd.xsl
+       xsltproc -output $@ tools/doc2dtd.xsl $<
 
-sdocbook-rng.xml: sdocbook.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
-       xsltproc -output $@ tools/rngdocxml.xsl $<
+docbook.dtd: docbook-dtd.xml tools/xml2dtd.xsl
+       xsltproc -output $@ tools/xml2dtd.xsl $<
+
+# ============================================================
 
 clean:
-       rm -f out*
+       rm -f *-rng.xml *-dtd.xml
\ No newline at end of file