Removing obsoleted directories from test docsrc build dir.

diff --git a/xsl/docsrcx/Makefile b/xsl/docsrcx/Makefile
index 04fb8798df9b4976829f0d89609ce1e8ab00696e..8102dcd41b347cf007b946e10aee458868cf9b47 100644 (file)
--- a/xsl/docsrcx/Makefile
+++ b/xsl/docsrcx/Makefile
@@ -1,25 +1,27 @@
 include ../../releasetools/Variables.mk
-DIRS=common refentry html fo manpages roundtrip slides-html slides-fo website template utility pi-fo pi-html pi-common
+
+PARAM_DIRS=html fo manpages roundtrip slides/fo slides/html website
+
+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
 
 DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
-PARAM_XSL_FILES=$(shell for file in $$(find .. -name "param.xsl"); do \
-       readlink -f $$file; done | grep -v xhtml)
+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)
 
-all: base $(DOCBOOK_ELEMENTS) $(XSL_PARAMS)
+#$(foreach param,$(shell grep "<xsl:param name" %/param.xsl | sed -r "s;^<xsl:param name=\"([^\"]+)\".+$$;\1;"),../$(param).xml)
 
-base:
-       for i in $(DIRS) __bogus__; do \
-               if [ $$i != __bogus__ ] ; then \
-                       echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
-               fi \
-       done
+../%/param.xml:
+       $(MAKE) -C $(dir $@) param.xml
 
 clean:
-       for i in $(DIRS) __bogus__; do \
-               if [ $$i != __bogus__ ] ; then \
-                       echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
-               fi \
-       done
+       $(RM) $(PARAM_XML_FILES)
+       $(RM) $(OTHER_XML_FILES)
 
 $(DOCBOOK_ELEMENTS): $(MAKE_ELEMENTS_XSL) $(DOCBOOK_RNG)
        $(XSLT) $(DOCBOOK_RNG) $< $@

diff --git a/xsl/docsrcx/fo/.cvsignore b/xsl/docsrcx/fo/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/fo/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/html/.cvsignore b/xsl/docsrcx/html/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/html/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/manpages/.cvsignore b/xsl/docsrcx/manpages/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/manpages/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/roundtrip/.cvsignore b/xsl/docsrcx/roundtrip/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/roundtrip/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/slides-fo/.cvsignore b/xsl/docsrcx/slides-fo/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/slides-fo/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/slides-html/.cvsignore b/xsl/docsrcx/slides-html/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/slides-html/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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

diff --git a/xsl/docsrcx/website/.cvsignore b/xsl/docsrcx/website/.cvsignore
deleted file mode 100644 (file)
index 597a43c..0000000
--- a/xsl/docsrcx/website/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.xml
-Makefile.param

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