(re)Integrated lib dir back into docsrc build.

diff --git a/xsl/docsrcx/Makefile b/xsl/docsrcx/Makefile
index 9f18d1272fe61f2129ddff5bf12d14de41ccf77a..f2f1c3a880e375437a94cac79f3ea98518dc7b51 100644 (file)
--- a/xsl/docsrcx/Makefile
+++ b/xsl/docsrcx/Makefile
@@ -12,19 +12,23 @@ OTHER_XML_FILES=../common/common.xml ../common/utility.xml ../common/refentry.xm
 DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
 PARAM_XSL_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xsl)
 
-all: $(PARAM_XML_FILES) $(PI_XML_FILES) $(OTHER_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
+all: $(PARAM_XML_FILES) ../lib/lib.xml $(PI_XML_FILES) $(OTHER_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
 
 ../%/param.xml:
        $(MAKE) -C $(dir $@) param.xml
 
+../lib/lib.xml:
+       $(MAKE) -C $(dir $@) lib.xml
+
 %.xml: %.xsl
-       $(XSLT) $< $(XSL2JREF) /dev/null output-file=.$@.tmp
-       $(XJPARSE) $(XJPARSEFLAGS) .$@.tmp
-       $(XSLT) .$@.tmp $(JREF2REFSECT1) $@
-       $(RM) .$@.tmp
+       $(XSLT) $< $(XSL2JREF) /dev/null output-file=$@.tmp
+       $(XJPARSE) $(XJPARSEFLAGS) $@.tmp
+       $(XSLT) $@.tmp $(JREF2REFSECT1) $@
+       $(RM) $@.tmp
 
 clean:
        $(RM) $(PARAM_XML_FILES)
+       $(RM) ../lib/lib.xml
        $(RM) $(PI_XML_FILES)
        $(RM) $(OTHER_XML_FILES)
 

diff --git a/xsl/docsrcx/reference.dbk b/xsl/docsrcx/reference.dbk
index 179b0feb45c122fdaf7a1fb1ebef12f47d3e90d7..3b5b63b834abf423c78e8a148f082f37884b8153 100644 (file)
--- a/xsl/docsrcx/reference.dbk
+++ b/xsl/docsrcx/reference.dbk
@@ -187,79 +187,55 @@
       <?dbhtml dir="lib"?>
       <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/bookinfo/title)" />
       <partintro id="libintro">
-        <xi:include href="../lib/lib.xml"
-          xpointer="xpointer(/book/preface/node())" />
+        <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/preface/node())" />
       </partintro>
       <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/reference)" />
     </part>
     <part xml:id="common">
       <?dbhtml dir="common"?>
-      <xi:include href="./common/common.refsect1.xml" xpointer="xpointer(/reference/title)" />
-
-      <xi:include href="./common/common.refsect1.xml"
-        xpointer="xpointer(/reference/partintro)" />
-
+      <xi:include href="../common/common.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../common/common.xml" xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="commontemplates">
         <title>Templates</title>
         <xi:include
-          href="./common/common.refsect1.xml"
-          xpointer="xpointer(/reference/refentry)" />
+          href="../common/common.xml" xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="refentry">
-      <?dbhtml dir="refentry"?>
-      <xi:include href="./refentry/refentry.refsect1.xml" xpointer="xpointer(/reference/title)" />
-
-      <xi:include href="./refentry/refentry.refsect1.xml"
-        xpointer="xpointer(/reference/partintro)" />
-
+      <?dbhtml dir="common"?>
+      <xi:include href="../common/refentry.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../common/refentry.xml" xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="refmetatemplates">
         <title>Templates</title>
-        <xi:include
-          href="./refentry/refentry.refsect1.xml"
-          xpointer="xpointer(/reference/refentry)" />
+        <xi:include href="../common/refentry.xml" xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="utility">
-      <?dbhtml dir="utility"?>
-      <xi:include href="./utility/utility.refsect1.xml" xpointer="xpointer(/reference/title)" />
-
-      <xi:include href="./utility/utility.refsect1.xml"
-        xpointer="xpointer(/reference/partintro)" />
-
+      <?dbhtml dir="common"?>
+      <xi:include href="../common/utility.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../common/utility.xml" xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="utilitytemplates">
         <title>Templates</title>
-        <xi:include
-          href="./utility/utility.refsect1.xml"
-          xpointer="xpointer(/reference/refentry)" />
+        <xi:include href="../common/utility.xml" xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="fo-table">
       <?dbhtml dir="fo"?>
-      <xi:include href="./fo/table.refsect1.xml" xpointer="xpointer(/reference/title)" />
-
-      <xi:include href="./fo/table.refsect1.xml"
+      <xi:include href="../fo/table.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../fo/table.xml"
         xpointer="xpointer(/reference/partintro)" />
-
       <reference xml:id="fotabletemplates">
         <title>Templates</title>
-        <xi:include
-          href="./fo/table.refsect1.xml"
-          xpointer="xpointer(/reference/refentry)" />
+        <xi:include href="../fo/table.xml" xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
     <part xml:id="template">
       <?dbhtml dir="template"?>
-      <xi:include href="./template/titlepage.refsect1.xml" xpointer="xpointer(/reference/title)" />
-
-      <xi:include href="./template/titlepage.refsect1.xml"
-        xpointer="xpointer(/reference/partintro)" />
-
+      <xi:include href="../template/titlepage.xml" xpointer="xpointer(/reference/title)" />
+      <xi:include href="../template/titlepage.xml" xpointer="xpointer(/reference/partintro)" />
       <reference xml:id="titlepagetemplates">
         <title>Templates</title>
-        <xi:include
-          href="./template/titlepage.refsect1.xml"
-          xpointer="xpointer(/reference/refentry)" />
+        <xi:include href="../template/titlepage.xml" xpointer="xpointer(/reference/refentry)" />
       </reference>
     </part>
   </book>