Moved param.xsl build up, out of html subdir. Rationale is too

allow better integration with DocBook XSL stylesheets build (if
we decide to move slides under xsl in source repository), and to
enable inclusion of potential fo params and params for other
slides output formats (svg, etc.) -- without needing to deal with
additional complexity of having a separate params.xsl file for
each slides output format.

diff --git a/slides/xsl/.cvsignore b/slides/xsl/.cvsignore
index 56631abf1919d1804b8f9d3fe4471fc5c1854375..36d4357c8a77ae17b81ddceadda37d7acce5fb32 100644 (file)
--- a/slides/xsl/.cvsignore
+++ b/slides/xsl/.cvsignore
@@ -1 +1,5 @@
+param.xsl
+param.xml
+param.html
 ChangeLog
+

diff --git a/slides/xsl/Makefile b/slides/xsl/Makefile
index 92c97231dafb5ed6de871c0b89eccf236cec31fa..c854cc1f29c4cda1bfb6af31373f50c6f4166564 100644 (file)
--- a/slides/xsl/Makefile
+++ b/slides/xsl/Makefile
@@ -1,10 +1,13 @@
 include ../../cvstools/Makefile.incl
 
-.PHONY: fo xhtml html
+.PHONY: fo xhtml
 
-DIRS = fo xhtml html
+PARAMPROF=.param.profiled
+PARAMSTRIP=.param.stripped
 
-all: base
+DIRS = fo xhtml
+
+all: base param.xsl
 
 base:
        for i in $(DIRS) __bogus__; do \
@@ -13,7 +16,30 @@ base:
                fi \
        done
 
+%.xsl: %.xml
+       $(XSLT) $< $(TTLTEMPLATEXSL) $@
+
+xml: param.xml
+
+html: param.html
+
+param.html: param.xml
+       $(XSLT) $< ../../xsl/docsrc/lrefentry.xsl $@
+
+param.xml: param.xweb
+       $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
+       $(XSLT) $(PARAMPROF) ../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
+       $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@
+       $(RM) $(PARAMPROF) $(PARAMSTRIP)
+
+param.xsl: param.xweb
+       $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
+       $(XSLT) $(PARAMPROF) ../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
+       $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@
+       $(RM) $(PARAMPROF) $(PARAMSTRIP)
+
 clean: 
+       $(RM) param.xsl param.xml param.html
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \

diff --git a/slides/xsl/html/Makefile b/slides/xsl/html/Makefile
deleted file mode 100644 (file)
index f02da07..0000000
--- a/slides/xsl/html/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-include ../../../cvstools/Makefile.incl
-
-PARAMPROF=.param.profiled
-PARAMSTRIP=.param.stripped
-
-all: param.xsl
-
-%.xsl: %.xml
-       $(XSLT) $< $(TTLTEMPLATEXSL) $@
-
-xml: param.xml
-
-html: param.html
-
-param.html: param.xml
-       $(XSLT) $< ../../../xsl/docsrc/lrefentry.xsl $@
-
-param.xml: param.xweb
-       $(XSLT) $< ../../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
-       $(XSLT) $(PARAMPROF) ../../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
-       $(XSLT) $(PARAMSTRIP) ../../../litprog/w2docbook.xsl $@
-       $(RM) $(PARAMPROF) $(PARAMSTRIP)
-
-param.xsl: param.xweb
-       $(XSLT) $< ../../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
-       $(XSLT) $(PARAMPROF) ../../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
-       $(XSLT) $(PARAMSTRIP) ../../../litprog/xtangle.xsl $@
-       $(RM) $(PARAMPROF) $(PARAMSTRIP)
-
-clean:
-       rm -f param.xsl param.xml param.html
-