Removed more obsoleted subdirs from test docsrc build.

diff --git a/xsl/docsrcx/Makefile b/xsl/docsrcx/Makefile
index 8102dcd41b347cf007b946e10aee458868cf9b47..dbbbca7ee29a56c2ea4530ec8a36b03064088b23 100644 (file)
--- a/xsl/docsrcx/Makefile
+++ b/xsl/docsrcx/Makefile
@@ -1,26 +1,26 @@
 include ../../releasetools/Variables.mk
 
 PARAM_DIRS=html fo manpages roundtrip slides/fo slides/html website
+PI_DIRS=html fo common
 
 PARAM_XML_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xml)
-OTHER_XML_FILES=common.xml template.xml utility.xml pi-fo.xml pi-html.xml
+PI_XML_FILES=$(foreach format,$(PI_DIRS),../$(format)/pi.xml)
+OTHER_XML_FILES=common.xml template.xml utility.xml pi-fo.xml pi-html.xml pi-common.xml
 
 DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
 PARAM_XSL_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xsl)
 
-all: $(PARAM_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
-
-debug:
-       @echo $(PARAM_XML_FILES)
-       @echo $(PARAM_XSL_FILES)
-
-#$(foreach param,$(shell grep "<xsl:param name" %/param.xsl | sed -r "s;^<xsl:param name=\"([^\"]+)\".+$$;\1;"),../$(param).xml)
+all: $(PARAM_XML_FILES) $(PI_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
 
 ../%/param.xml:
        $(MAKE) -C $(dir $@) param.xml
 
+../%/pi.xml:
+       $(MAKE) -C $(dir $@) pi.xml
+
 clean:
        $(RM) $(PARAM_XML_FILES)
+       $(RM) $(PI_XML_FILES)
        $(RM) $(OTHER_XML_FILES)
 
 $(DOCBOOK_ELEMENTS): $(MAKE_ELEMENTS_XSL) $(DOCBOOK_RNG)

diff --git a/xsl/docsrcx/pi-common/Makefile b/xsl/docsrcx/pi-common/Makefile
deleted file mode 100644 (file)
index 35830a3..0000000
--- a/xsl/docsrcx/pi-common/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../common
-XMLFILES = pi.xml pi.refsect1.xml
-include ../Makefile.incl

diff --git a/xsl/docsrcx/pi-fo/Makefile b/xsl/docsrcx/pi-fo/Makefile
deleted file mode 100644 (file)
index d3a4b8f..0000000
--- a/xsl/docsrcx/pi-fo/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../fo
-XMLFILES = pi.xml pi.refsect1.xml
-include ../Makefile.incl

diff --git a/xsl/docsrcx/pi-html/Makefile b/xsl/docsrcx/pi-html/Makefile
deleted file mode 100644 (file)
index d3a4b8f..0000000
--- a/xsl/docsrcx/pi-html/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../fo
-XMLFILES = pi.xml pi.refsect1.xml
-include ../Makefile.incl

diff --git a/xsl/docsrcx/reference.dbk b/xsl/docsrcx/reference.dbk
index c19123983fca9ea027c39836739afe801774d36d..179b0feb45c122fdaf7a1fb1ebef12f47d3e90d7 100644 (file)
--- a/xsl/docsrcx/reference.dbk
+++ b/xsl/docsrcx/reference.dbk
@@ -58,66 +58,66 @@
     </info>
     <part xml:id="html">
       <?dbhtml dir="html"?>
-      <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../html/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="htmlintro">
-        <xi:include href="./html/docparam.xml"
+        <xi:include href="../html/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../html/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="fo">
       <?dbhtml dir="fo"?>
-      <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../fo/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="fointro">
-        <xi:include href="./fo/docparam.xml"
+        <xi:include href="../fo/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../fo/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="manpages">
       <?dbhtml dir="manpages"?>
-      <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../manpages/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="manintro">
-        <xi:include href="./manpages/docparam.xml"
+        <xi:include href="../manpages/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../manpages/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="roundtrip">
       <?dbhtml dir="roundtrip"?>
-      <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../roundtrip/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="roundtripintro">
-        <xi:include href="./roundtrip/docparam.xml"
+        <xi:include href="../roundtrip/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../roundtrip/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="slides-html">
       <?dbhtml dir="slides-html"?>
-      <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../slides/html/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="slideshtmlintro">
-        <xi:include href="./slides-html/docparam.xml"
+        <xi:include href="../slides/html/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../slides/html/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="slides-fo">
       <?dbhtml dir="slides-fo"?>
-      <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../slides/fo/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="slidesfointro">
-        <xi:include href="./slides-fo/docparam.xml"
+        <xi:include href="../slides/fo/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../slides/fo/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="website">
       <?dbhtml dir="website"?>
-      <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <xi:include href="../website/param.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro xml:id="websiteintro">
-        <xi:include href="./website/docparam.xml"
+        <xi:include href="../website/param.xml"
           xpointer="xpointer(/book/bookinfo/abstract/node())" />
       </partintro>
-      <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/reference)" />
+      <xi:include href="../website/param.xml" xpointer="xpointer(/book/reference)" />
     </part>
   </book>
   <book xml:id="pi"><title>DocBook XSL Stylesheets User Reference: PIs</title>
@@ -138,37 +138,37 @@
     </info>
     <part xml:id="pi-html">
       <?dbhtml dir="pi"?>
-      <xi:include href="./pi-html/pi.refsect1.xml" xpointer="xpointer(/reference/title)" />
-      <xi:include href="./pi-html/pi.refsect1.xml"
+      <xi:include href="../html/pi.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../html/pi.xml"
         xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="pi-html-ref">
         <title>Templates</title>
         <xi:include
-          href="./pi-html/pi.refsect1.xml"
+          href="../html/pi.xml"
           xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="pi-fo">
       <?dbhtml dir="pi"?>
-      <xi:include href="./pi-fo/pi.refsect1.xml" xpointer="xpointer(/reference/title)" />
-      <xi:include href="./pi-fo/pi.refsect1.xml"
+      <xi:include href="../fo/pi.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../fo/pi.xml"
         xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="pi-fo-ref">
         <title>Templates</title>
         <xi:include
-          href="./pi-fo/pi.refsect1.xml"
+          href="../fo/pi.xml"
           xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="pi-common">
       <?dbhtml dir="pi"?>
-      <xi:include href="./pi-common/pi.refsect1.xml" xpointer="xpointer(/reference/title)" />
-      <xi:include href="./pi-common/pi.refsect1.xml"
+      <xi:include href="../common/pi.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../common/pi.xml"
         xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="pi-common-ref">
         <title>Templates</title>
         <xi:include
-          href="./pi-common/pi.refsect1.xml"
+          href="../common/pi.xml"
           xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>

diff --git a/xsl/docsrcx/warranty.xml b/xsl/docsrcx/warranty.xml
index 99d230f2adcb9a01e42d71687fbbdaa9ec5ca832..4403d81aa45b7a0a788ce81ee38a760d1c67bb93 100644 (file)
--- a/xsl/docsrcx/warranty.xml
+++ b/xsl/docsrcx/warranty.xml
@@ -1,7 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE legalnotice
-  PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <legalnotice id="warranty"><title>Warranty</title>
 <para>THE SOFTWARE IS PROVIDED <quote>AS IS</quote>,
 WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT