From aa78a7c62738f5914ce5736962d7250a47fda330 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Thu, 6 Apr 2006 02:19:55 +0000
Subject: [PATCH] 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.

---
 xsl/doc/Makefile                        |  2 +-
 xsl/doc/slides/{html => }/.cvsignore    |  0
 xsl/doc/slides/{html => }/Makefile      |  8 ++++----
 xsl/docsrc/Makefile                     |  2 +-
 xsl/docsrc/reference.xml                |  6 +++---
 xsl/docsrc/slides/{html => }/.cvsignore |  0
 xsl/docsrc/slides/Makefile              | 19 +++++++++++++++++++
 xsl/docsrc/slides/html/Makefile         | 19 -------------------
 8 files changed, 28 insertions(+), 28 deletions(-)
 rename xsl/doc/slides/{html => }/.cvsignore (100%)
 rename xsl/doc/slides/{html => }/Makefile (54%)
 rename xsl/docsrc/slides/{html => }/.cvsignore (100%)
 create mode 100644 xsl/docsrc/slides/Makefile
 delete mode 100644 xsl/docsrc/slides/html/Makefile

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index e37714f1c..6402f0767 100644
--- 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 8cfa4b152..fca566ed6 100644
--- 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 497e4ae6e..27ff7f26a 100644
--- 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 aa8bde991..bb0ecc099 100644
--- 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
index 000000000..665f5a6d1
--- /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
index a7b2ae72e..000000000
--- 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
-- 
2.40.0