From 9e5131a48463336ee9cf53d934eb925057a0e996 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Thu, 6 Apr 2006 02:56:36 +0000
Subject: [PATCH] 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.

---
 slides/xsl/.cvsignore    |  4 ++++
 slides/xsl/Makefile      | 32 +++++++++++++++++++++++++++++---
 slides/xsl/html/Makefile | 32 --------------------------------
 3 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 slides/xsl/html/Makefile

diff --git a/slides/xsl/.cvsignore b/slides/xsl/.cvsignore
index 56631abf1..36d4357c8 100644
--- 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 92c97231d..c854cc1f2 100644
--- 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
index f02da071d..000000000
--- 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
-
-- 
2.40.0