Reworked doc build to depend on params.xsl file in slides/

instead of in slides/html. This makes xsl/slides build consistent
with other output formats. With this setup we avoid needing to
deal with potentially having a separate params.xsl file for each
separate subdir of the slides dir -- instead, if when params for
other than HTML output from slides are added, they just all go in
the single slides/param.xsl file.

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index e37714f1c838fbff03f6dfa9bf5447de1819181e..6402f07671a442dbc557e03b38d1b78f4f4a494b 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -9,7 +9,7 @@ CRSTYLE=creference.xsl
 BSTYLE=book.xsl
 VPATH=../docsrc
 
-DIRS=common refentry lib html fo manpages wordml slides/html website tools template pi
+DIRS=common refentry lib html fo manpages wordml slides website tools template pi
 
 all: copyright.html warranty.html reference.html index.html
        for i in $(DIRS) __bogus__; do \

diff --git a/xsl/doc/slides/html/.cvsignore b/xsl/doc/slides/.cvsignore
similarity index 100%
rename from xsl/doc/slides/html/.cvsignore
rename to xsl/doc/slides/.cvsignore

diff --git a/xsl/doc/slides/html/Makefile b/xsl/doc/slides/Makefile
similarity index 54%
rename from xsl/doc/slides/html/Makefile
rename to xsl/doc/slides/Makefile
index 8cfa4b1527ad72d200c0ac25bf0ede928bba245b..fca566ed6f4acd0cc41149f19ac16d63c33aa3bf 100644 (file)
--- a/xsl/doc/slides/html/Makefile
+++ b/xsl/doc/slides/Makefile
@@ -1,7 +1,7 @@
-include ../../../../cvstools/Makefile.incl
+include ../../../cvstools/Makefile.incl
 
-STYLE=../../jrefhtml.xsl
-VPATH=../../../docsrc/slides/html/
+STYLE=../jrefhtml.xsl
+VPATH=../../docsrc/slides/
 XSLTOPT=
 
 HTMLFILES = param.html
@@ -12,7 +12,7 @@ all: $(HTMLFILES)
        $(XSLT) $< $(STYLE) $@ $(XSLTOPT)
 
 param.html: docparam.xml
-       $(XSLT) $< ../../../docsrc/clrefentry.xsl $(XSLTOPT)
+       $(XSLT) $< ../../docsrc/clrefentry.xsl $(XSLTOPT)
        touch param.html
 
 clean:

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 497e4ae6eea90d1780c8c5bd5950ca55462fa085..27ff7f26ae5797a22842570f3da62c63eedadfac 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,5 +1,5 @@
 include ../../cvstools/Makefile.incl
-DIRS=common refentry html fo manpages wordml slides/html website template tools pi
+DIRS=common refentry html fo manpages wordml slides website template tools pi
 
 DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng
 PARAM_XSL_FILES=$(shell for file in $$(find . -name "param.xsl"); do \

diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml
index aa8bde99106c0ae84b4f9bd649b4c909882a924c..bb0ecc099f46e6759a303b6356b49ef0ab461121 100644 (file)
--- a/xsl/docsrc/reference.xml
+++ b/xsl/docsrc/reference.xml
@@ -9,7 +9,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 <!ENTITY fo-table.xml SYSTEM "fo/table.xml" NDATA SGML>
 <!ENTITY manpages-param.xml SYSTEM "manpages/docparam.xml" NDATA SGML>
 <!ENTITY wordml-param.xml SYSTEM "wordml/docparam.xml" NDATA SGML>
-<!ENTITY slides-html-param.xml SYSTEM "slides/html/docparam.xml" NDATA SGML>
+<!ENTITY slides-param.xml SYSTEM "slides/docparam.xml" NDATA SGML>
 <!ENTITY website-param.xml SYSTEM "website/docparam.xml" NDATA SGML>
 <!ENTITY titlepage.xml SYSTEM "template/titlepage.xml" NDATA SGML>
 ]>
@@ -47,8 +47,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
       <listitem><para><olink type="title" localinfo="wordml/index.html"
       targetdocent="wordml-param.xml"/></para>
       </listitem>
-      <listitem><para><olink type="title" localinfo="slides/html/index.html"
-      targetdocent="slides-html-param.xml"/></para>
+      <listitem><para><olink type="title" localinfo="slides/index.html"
+      targetdocent="slides-param.xml"/></para>
       </listitem>
       <listitem><para><olink type="title" localinfo="website/index.html"
       targetdocent="website-param.xml"/></para>

diff --git a/xsl/docsrc/slides/html/.cvsignore b/xsl/docsrc/slides/.cvsignore
similarity index 100%
rename from xsl/docsrc/slides/html/.cvsignore
rename to xsl/docsrc/slides/.cvsignore

diff --git a/xsl/docsrc/slides/Makefile b/xsl/docsrc/slides/Makefile
new file mode 100644 (file)
index 0000000..665f5a6
--- /dev/null
+++ b/xsl/docsrc/slides/Makefile
@@ -0,0 +1,19 @@
+include ../../../cvstools/Makefile.incl
+
+JSTYLE=../../docsrc/xsl2jref.xsl
+VPATH=../../slides
+
+XMLFILES = docparam.xml
+
+all: $(XMLFILES)
+
+clean:
+       $(RM) $(XMLFILES)
+
+%.xml : %.xsl $(JSTYLE)
+       $(XSLT) $< $(JSTYLE) /dev/null output-file=$@
+       $(XJPARSE) $@
+
+docparam.xml: ../../slides/param.xsl
+       $(MAKE) -C ../../slides param.xml
+       cp ../../slides/param.xml docparam.xml

diff --git a/xsl/docsrc/slides/html/Makefile b/xsl/docsrc/slides/html/Makefile
deleted file mode 100644 (file)
index a7b2ae7..0000000
--- a/xsl/docsrc/slides/html/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include ../../../../cvstools/Makefile.incl
-
-JSTYLE=../../../docsrc/xsl2jref.xsl
-VPATH=../../../slides/html
-
-XMLFILES = docparam.xml
-
-all: $(XMLFILES)
-
-clean:
-       $(RM) $(XMLFILES)
-
-%.xml : %.xsl $(JSTYLE)
-       $(XSLT) $< $(JSTYLE) /dev/null output-file=$@
-       $(XJPARSE) $@
-
-docparam.xml: ../../../slides/html/param.xsl
-       $(MAKE) -C ../../../slides/html param.xml
-       cp ../../../slides/html/param.xml docparam.xml