Use index.html files as targets (instead of zero-byte param.html

stamp files we were using); quit doing $(RM) *.html in clean and
instead do clean using a list of the HTML files that we know we
have actually generated. Also add pi directory to list of
directory to recurse and make (had been accidentally left out for
1.71.0 build).

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 8534406897add0881b3470b6205cd0592a028ad5..5a85d6407042304481f4b466c79095f22e5a0d11 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -16,7 +16,7 @@ GZIPFLAGS=
 
 VPATH=../docsrc
 
-DIRS=common refentry lib html fo manpages wordml slides website template
+DIRS=common refentry lib html fo manpages wordml slides website template pi
 
 # build reference.pdf.gz except for snapshot releases
 ifneq (snapshot,$(findstring snapshot,$(RELVER)))
@@ -68,14 +68,18 @@ reference.txt.gz: reference.txt
        cat $< | $(GZIP) $(GZIPFLAGS) > $@
 
 clean:
-       $(RM) *.html
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
                fi \
        done
+       $(RM) copyright.html
+       $(RM) index.html
+       $(RM) reference.html
+       $(RM) warranty.html
        $(RM) reference.fo
        $(RM) reference.pdf
        $(RM) reference.txt
+       $(RM) reference.txt.html
        $(RM) reference.pdf.gz
        $(RM) reference.txt.gz

diff --git a/xsl/doc/Makefile.incl b/xsl/doc/Makefile.incl
index be23532ac46736f75fca06206970871677788458..725ebb8da81154ab2bd3abcad8c96d64ccb41483 100644 (file)
--- a/xsl/doc/Makefile.incl
+++ b/xsl/doc/Makefile.incl
@@ -1,14 +1,17 @@
 # Makefile.incl gets included by makefiles in all subdirs
 
+PARAMFILES = $(shell if [ -f $(VPATH)/docparam.xml ]; then $(XSLT) $(VPATH)/docparam.xml $(DOCPARAM2TXT); fi)
+
 all: $(HTMLFILES)
 
 %.html : %.xml $(JREFHTML)
        $(XSLT) $< $(JREFHTML) $@ $(XSLTOPT)
 
-param.html: docparam.xml
+index.html: docparam.xml
        $(XSLT) $< $(CLREFENTRY) $(XSLTOPT)
-       touch param.html
 
 clean:
        $(RM) $(HTMLFILES)
-       $(RM) *.html
+ifneq ($(PARAMFILES),)
+       $(RM) $(PARAMFILES)
+endif

diff --git a/xsl/doc/fo/Makefile b/xsl/doc/fo/Makefile
index a9490b9b89b9e2c562aea6b03ad44abb2fa260cc..da7148d9a9f2cf5c82514be356f9d2bfe93befcc 100644 (file)
--- a/xsl/doc/fo/Makefile
+++ b/xsl/doc/fo/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/fo
-HTMLFILES = param.html table.html
+HTMLFILES = index.html table.html
 include ../Makefile.incl

diff --git a/xsl/doc/html/Makefile b/xsl/doc/html/Makefile
index 340cd61bd6df3fe9b65e8143b48283872f6070a5..007900e4140212d164768d29374bc18ee6effcaa 100644 (file)
--- a/xsl/doc/html/Makefile
+++ b/xsl/doc/html/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/html
-HTMLFILES = param.html
+HTMLFILES = index.html
 include ../Makefile.incl

diff --git a/xsl/doc/manpages/Makefile b/xsl/doc/manpages/Makefile
index dc0af9c37ed44abc53edaacd99187b02b6e7701b..98c468ced00b4834bfabe948a7697da8c20b82b8 100644 (file)
--- a/xsl/doc/manpages/Makefile
+++ b/xsl/doc/manpages/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/manpages
-HTMLFILES = param.html
+HTMLFILES = index.html
 include ../Makefile.incl

diff --git a/xsl/doc/pi/Makefile b/xsl/doc/pi/Makefile
index f8f9f4ffca86f719431a6388603a9c07ceccb190..5753e0c6d91c8ecc046276fc35c2dfcefcacc2ac 100644 (file)
--- a/xsl/doc/pi/Makefile
+++ b/xsl/doc/pi/Makefile
@@ -1,8 +1,7 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/pi
-HTMLFILES = pi.html
+HTMLFILES = common.html
 include ../Makefile.incl
 
-pi.html: pi.xml
+common.html: pi.xml
        $(XSLT) $< $(PIREFENTRY) $(XSLTOPT)
-       touch $@

diff --git a/xsl/doc/slides/Makefile b/xsl/doc/slides/Makefile
index 16b1a6c916d428865b93295e7724a6503ecd6c67..6b43114d1a1f6aba2d6d347eed5a64cfd13c335b 100644 (file)
--- a/xsl/doc/slides/Makefile
+++ b/xsl/doc/slides/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/slides/
-HTMLFILES = param.html
+HTMLFILES = index.html
 include ../Makefile.incl

diff --git a/xsl/doc/website/Makefile b/xsl/doc/website/Makefile
index 56b16f8f931348de94c4182bd7e898c5ed9b2d8a..525beeac3617133ad5504a99a815ce9e0d71651c 100644 (file)
--- a/xsl/doc/website/Makefile
+++ b/xsl/doc/website/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/website
-HTMLFILES = param.html
+HTMLFILES = index.html
 include ../Makefile.incl

diff --git a/xsl/doc/wordml/Makefile b/xsl/doc/wordml/Makefile
index e9533067c0e8684c72780f5722c7352d98e62fe8..f9034e53555fe9c01dd392cbbfa2ee1ebad5f2c2 100644 (file)
--- a/xsl/doc/wordml/Makefile
+++ b/xsl/doc/wordml/Makefile
@@ -1,4 +1,4 @@
 include ../../../releasetools/Variables.mk
 VPATH=../../docsrc/wordml
-HTMLFILES = param.html
+HTMLFILES = index.html
 include ../Makefile.incl

diff --git a/xsl/tools/xsl/build/docparam2txt.xsl b/xsl/tools/xsl/build/docparam2txt.xsl
new file mode 100644 (file)
index 0000000..ebf1e32
--- /dev/null
+++ b/xsl/tools/xsl/build/docparam2txt.xsl
@@ -0,0 +1,24 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+<xsl:output method="text" indent="no"/>
+
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://docbook.sf.net/release/xsl/current for
+     copyright and other information.
+
+     ******************************************************************** -->
+
+<xsl:template match="preface|reference|refentry|appendix">
+  <xsl:value-of select="concat(@id,'.html','&#x0a;')"/>
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="text()"/>
+
+</xsl:stylesheet>