From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sun, 8 Jul 2007 09:46:37 +0000 (+0000)
Subject: Removed remaining obsoleted directories from docsrc build and made
X-Git-Tag: release/1.79.1~6^2~2014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f2eecc5ab9ebeb6c8805cb7147bdee4e7b7053a;p=docbook-dsssl

Removed remaining obsoleted directories from docsrc build and made
final changes to docsrc makefile for new docsrc build method.
---

diff --git a/xsl/docsrcx/Makefile b/xsl/docsrcx/Makefile
index dbbbca7ee..9f18d1272 100644
--- a/xsl/docsrcx/Makefile
+++ b/xsl/docsrcx/Makefile
@@ -1,22 +1,27 @@
 include ../../releasetools/Variables.mk
 
+XJPARSEFLAGS= -E 0 -w
+
 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)
 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
+OTHER_XML_FILES=../common/common.xml ../common/utility.xml ../common/refentry.xml ../template/titlepage.xml ../fo/table.xml
 
 DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
 PARAM_XSL_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xsl)
 
-all: $(PARAM_XML_FILES) $(PI_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
+all: $(PARAM_XML_FILES) $(PI_XML_FILES) $(OTHER_XML_FILES) $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
 
 ../%/param.xml:
 	$(MAKE) -C $(dir $@) param.xml
 
-../%/pi.xml:
-	$(MAKE) -C $(dir $@) pi.xml
+%.xml: %.xsl
+	$(XSLT) $< $(XSL2JREF) /dev/null output-file=.$@.tmp
+	$(XJPARSE) $(XJPARSEFLAGS) .$@.tmp
+	$(XSLT) .$@.tmp $(JREF2REFSECT1) $@
+	$(RM) .$@.tmp
 
 clean:
 	$(RM) $(PARAM_XML_FILES)
diff --git a/xsl/docsrcx/common/.cvsignore b/xsl/docsrcx/common/.cvsignore
deleted file mode 100644
index 6722cd96e..000000000
--- a/xsl/docsrcx/common/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.xml
diff --git a/xsl/docsrcx/common/Makefile b/xsl/docsrcx/common/Makefile
deleted file mode 100644
index 01e1c7829..000000000
--- a/xsl/docsrcx/common/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../common
-XMLFILES = common.xml common.refsect1.xml
-include ../Makefile.incl
diff --git a/xsl/docsrcx/refentry/.cvsignore b/xsl/docsrcx/refentry/.cvsignore
deleted file mode 100644
index 6722cd96e..000000000
--- a/xsl/docsrcx/refentry/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.xml
diff --git a/xsl/docsrcx/refentry/Makefile b/xsl/docsrcx/refentry/Makefile
deleted file mode 100644
index 5be64c7b7..000000000
--- a/xsl/docsrcx/refentry/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../common
-XMLFILES = refentry.xml refentry.refsect1.xml
-include ../Makefile.incl
diff --git a/xsl/docsrcx/template/.cvsignore b/xsl/docsrcx/template/.cvsignore
deleted file mode 100644
index 6722cd96e..000000000
--- a/xsl/docsrcx/template/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.xml
diff --git a/xsl/docsrcx/template/Makefile b/xsl/docsrcx/template/Makefile
deleted file mode 100644
index dad0c4d82..000000000
--- a/xsl/docsrcx/template/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../template
-XMLFILES = titlepage.xml titlepage.refsect1.xml
-include ../Makefile.incl
diff --git a/xsl/docsrcx/utility/.cvsignore b/xsl/docsrcx/utility/.cvsignore
deleted file mode 100644
index 6722cd96e..000000000
--- a/xsl/docsrcx/utility/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.xml
diff --git a/xsl/docsrcx/utility/Makefile b/xsl/docsrcx/utility/Makefile
deleted file mode 100644
index 259c18706..000000000
--- a/xsl/docsrcx/utility/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../../../releasetools/Variables.mk
-VPATH=../../common
-XMLFILES = utility.xml utility.refsect1.xml
-include ../Makefile.incl