Clean up slides build process.

diff --git a/xsl/slides/fo/Makefile.param b/xsl/slides/fo/Makefile.param
index f2c929c060af66bc9f01ba522f8adbcfae589aca..c2a839280e2e960ce8a87f49d3d994095533167a 100644 (file)
--- a/xsl/slides/fo/Makefile.param
+++ b/xsl/slides/fo/Makefile.param
@@ -1,35 +1 @@
-PARAMS=../../params/foil.footer.properties.xml \
-       ../../params/foil.header.properties.xml \
-       ../../params/foil.master.properties.xml \
-       ../../params/foil.page-sequence.properties.xml \
-       ../../params/foil.properties.xml \
-       ../../params/foil.region-after.properties.xml \
-       ../../params/foil.region-before.properties.xml \
-       ../../params/foil.region-body.properties.xml \
-       ../../params/foil.subtitle.properties.xml \
-       ../../params/foil.title.master.xml \
-       ../../params/foil.title.properties.xml \
-       ../../params/foil.title.size.xml \
-       ../../params/generate.copyright.xml \
-       ../../params/generate.foilgroup.numbered.toc.xml \
-       ../../params/generate.foilgroup.toc.xml \
-       ../../params/generate.handoutnotes.xml \
-       ../../params/generate.page.number.xml \
-       ../../params/generate.pubdate.xml \
-       ../../params/generate.speakernotes.xml \
-       ../../params/generate.titlepage.xml \
-       ../../params/handoutnotes.properties.xml \
-       ../../params/mml.embedding.mode.fo.xml \
-       ../../params/slide.font.family.xml \
-       ../../params/slide.title.font.family.xml \
-       ../../params/slides.properties.xml \
-       ../../params/slides.titlepage.author.properties.xml \
-       ../../params/slides.titlepage.authorgroup.properties.xml \
-       ../../params/slides.titlepage.corpauthor.properties.xml \
-       ../../params/slides.titlepage.master.properties.xml \
-       ../../params/slides.titlepage.pubdate.properties.xml \
-       ../../params/slides.titlepage.region-body.properties.xml \
-       ../../params/slides.titlepage.subtitle.properties.xml \
-       ../../params/slides.titlepage.title.properties.xml \
-       ../../params/speakernotes.properties.xml \
-       ../../params/svg.embedding.mode.fo.xml
+# foo

diff --git a/xsl/slides/images/Makefile b/xsl/slides/images/Makefile
index 0040b0c69c14c30e484a1329f570c8fe5a910918..9fbace5b5428767d2d7bec3c493cb635a22b4ff8 100644 (file)
--- a/xsl/slides/images/Makefile
+++ b/xsl/slides/images/Makefile
@@ -1,7 +1,11 @@
-all:
-       cp ../slidy/graphics/face* ./
-       cd callouts && make all
+faces=face1.gif face2.gif face3.gif face4.gif
+
+all: $(faces)
+       $(MAKE) -C callouts
 
 clean:
        rm ./face*
-       cd callouts && make clean
+       $(MAKE) -C callouts clean
+
+%.gif: ../slidy/graphics/%.gif
+       cp $< $@

diff --git a/xsl/slides/images/callouts/Makefile b/xsl/slides/images/callouts/Makefile
index c1e38d3fa9a2db33ad272e90c9a82ecbee28235f..86e0b68486ed02e598b855544c87f06fda561791 100644 (file)
--- a/xsl/slides/images/callouts/Makefile
+++ b/xsl/slides/images/callouts/Makefile
@@ -1,5 +1,23 @@
-all:
-       /bin/sh ./gen.sh
+low_svg=$(patsubst %, %.svg, $(shell seq 1 9))
+high_svg=$(patsubst %, %.svg, $(shell seq 10 30))
+low_png=$(patsubst %.svg, %.png, $(low_svg))
+high_png=$(patsubst %.svg, %.png, $(high_svg))
+
+all: $(low_svg) $(high_svg) $(low_png) $(high_png)
 
 clean:
        rm -rf ./*.png
+       rm -rf ./*.svg
+
+$(low_svg): %.svg:
+       convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.svg
+
+$(low_png): %.png:
+       convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.png
+
+$(high_svg): %.svg:
+       convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.svg
+
+$(high_png): %.png:
+       convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.png
+

diff --git a/xsl/slides/images/callouts/gen.sh b/xsl/slides/images/callouts/gen.sh
deleted file mode 100755 (executable)
index bba3195..0000000
--- a/xsl/slides/images/callouts/gen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-#
-# This script was taken from FreeBSD.
-#
-# It uses ImageMagick to generate callout icons.
-#
-
-for i in `seq 9 1`
-do
-    convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.png
-    convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.svg
-done
-
-for i in `seq 21 10`
-do
-    convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.png
-    convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.svg
-done
-
-exit 0

diff --git a/xsl/slides/images/face1.gif b/xsl/slides/images/face1.gif
deleted file mode 100644 (file)
index 04e50cd..0000000
Binary files a/xsl/slides/images/face1.gif and /dev/null differ

diff --git a/xsl/slides/images/face2.gif b/xsl/slides/images/face2.gif
deleted file mode 100644 (file)
index 12d8240..0000000
Binary files a/xsl/slides/images/face2.gif and /dev/null differ

diff --git a/xsl/slides/images/face3.gif b/xsl/slides/images/face3.gif
deleted file mode 100644 (file)
index ac6e5e4..0000000
Binary files a/xsl/slides/images/face3.gif and /dev/null differ

diff --git a/xsl/slides/images/face4.gif b/xsl/slides/images/face4.gif
deleted file mode 100644 (file)
index 3f68740..0000000
Binary files a/xsl/slides/images/face4.gif and /dev/null differ

diff --git a/xsl/slides/schema/xsd/Makefile b/xsl/slides/schema/xsd/Makefile
index b3c2f54efe3614d2a3c2ab72b8c6e5b642a274fb..dfd897cc1fb069f62dffa92f4d3677c2e1497aff 100644 (file)
--- a/xsl/slides/schema/xsd/Makefile
+++ b/xsl/slides/schema/xsd/Makefile
@@ -6,6 +6,4 @@ slides.xsd: ../relaxng/slides.rnc
        trang $< $@
 
 clean:
-
-maintainer-clean: clean
-       rm -f *.xsd
+       rm -rf *.xsd

diff --git a/xsl/slides/xhtml/Makefile.param b/xsl/slides/xhtml/Makefile.param
index 127c0d5322f30b9e1b7da4133b6a1c158a02c189..c2a839280e2e960ce8a87f49d3d994095533167a 100644 (file)
--- a/xsl/slides/xhtml/Makefile.param
+++ b/xsl/slides/xhtml/Makefile.param
@@ -1,26 +1 @@
-PARAMS=../../params/disable.collapsible.xml \
-       ../../params/disable.incremental.xml \
-       ../../params/generate.copyright.xml \
-       ../../params/generate.foilgroup.numbered.toc.xml \
-       ../../params/generate.foilgroup.toc.xml \
-       ../../params/generate.handoutnotes.xml \
-       ../../params/generate.pubdate.xml \
-       ../../params/generate.speakernotes.xml \
-       ../../params/generate.titlepage.xml \
-       ../../params/mml.embedding.mode.xml \
-       ../../params/svg.embedding.mode.xml \
-       ../../params/user.css.xml \
-       ../../params/wrap.slidecontent.xml \
-       ../../params/s5.controls.xml \
-       ../../params/s5.defaultview.xml \
-       ../../params/s5.opera.css.xml \
-       ../../params/s5.outline.css.xml \
-       ../../params/s5.path.prefix.xml \
-       ../../params/s5.print.css.xml \
-       ../../params/s5.slides.css.xml \
-       ../../params/s5.slides.js.xml \
-       ../../params/slidy.duration.xml \
-       ../../params/slidy.path.prefix.xml \
-       ../../params/slidy.slidy.css.xml \
-       ../../params/slidy.slidy.js.xml \
-       ../../params/slidy.user.css.xml
+# foo