Moved many files from slides/ to xsl/slides/

diff --git a/xsl/slides/Makefile b/xsl/slides/Makefile
index 5e3cb89fc8b9bd3110a73ef1d8f04232362cdab1..e33e2cd1aa2b087fc4d937c1d6f7b6a5c39b4797 100644 (file)
--- a/xsl/slides/Makefile
+++ b/xsl/slides/Makefile
@@ -1,14 +1,14 @@
 include ../../buildtools/Makefile.incl
 
-DIRS = fo xhtml
+subdirs:=schema images fo xhtml
 
 base:
-       for i in $(DIRS); do \
-         echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
+       for d in $(subdirs); do \
+         $(MAKE) -C $$d; \
        done
 
 clean:
-       for i in $(DIRS); do \
-         echo "$(MAKE) -C $$i clean"; $(MAKE) -C $$i clean; \
+       for d in $(subdirs); do \
+         $(MAKE) -C $$d clean; \
        done
        rm xhtml/params.xsl

diff --git a/slides/README b/xsl/slides/README
similarity index 100%
rename from slides/README
rename to xsl/slides/README

diff --git a/slides/RELEASE-NOTES.xml b/xsl/slides/RELEASE-NOTES.xml
similarity index 100%
rename from slides/RELEASE-NOTES.xml
rename to xsl/slides/RELEASE-NOTES.xml

diff --git a/slides/doc/.gitignore b/xsl/slides/doc/.gitignore
similarity index 100%
rename from slides/doc/.gitignore
rename to xsl/slides/doc/.gitignore

diff --git a/slides/doc/Makefile b/xsl/slides/doc/Makefile
similarity index 100%
rename from slides/doc/Makefile
rename to xsl/slides/doc/Makefile

diff --git a/slides/doc/slides.xml b/xsl/slides/doc/slides.xml
similarity index 100%
rename from slides/doc/slides.xml
rename to xsl/slides/doc/slides.xml

diff --git a/slides/doc/user.css b/xsl/slides/doc/user.css
similarity index 100%
rename from slides/doc/user.css
rename to xsl/slides/doc/user.css

diff --git a/slides/images/Makefile b/xsl/slides/images/Makefile
similarity index 67%
rename from slides/images/Makefile
rename to xsl/slides/images/Makefile
index e3607bba65c6a06ceb1a493a41030e6f34c01fc4..0040b0c69c14c30e484a1329f570c8fe5a910918 100644 (file)
--- a/slides/images/Makefile
+++ b/xsl/slides/images/Makefile
@@ -1,5 +1,5 @@
 all:
-       cp ../files/slidy/graphics/face* ./
+       cp ../slidy/graphics/face* ./
        cd callouts && make all
 
 clean:

diff --git a/slides/images/callouts/Makefile b/xsl/slides/images/callouts/Makefile
similarity index 100%
rename from slides/images/callouts/Makefile
rename to xsl/slides/images/callouts/Makefile

diff --git a/slides/images/callouts/gen.sh b/xsl/slides/images/callouts/gen.sh
similarity index 100%
rename from slides/images/callouts/gen.sh
rename to xsl/slides/images/callouts/gen.sh

diff --git a/slides/images/face1.gif b/xsl/slides/images/face1.gif
similarity index 100%
rename from slides/images/face1.gif
rename to xsl/slides/images/face1.gif

diff --git a/slides/images/face2.gif b/xsl/slides/images/face2.gif
similarity index 100%
rename from slides/images/face2.gif
rename to xsl/slides/images/face2.gif

diff --git a/slides/images/face3.gif b/xsl/slides/images/face3.gif
similarity index 100%
rename from slides/images/face3.gif
rename to xsl/slides/images/face3.gif

diff --git a/slides/images/face4.gif b/xsl/slides/images/face4.gif
similarity index 100%
rename from slides/images/face4.gif
rename to xsl/slides/images/face4.gif

diff --git a/slides/locatingrules.xml b/xsl/slides/locatingrules.xml
similarity index 100%
rename from slides/locatingrules.xml
rename to xsl/slides/locatingrules.xml

diff --git a/slides/schema/.gitignore b/xsl/slides/schema/.gitignore
similarity index 100%
rename from slides/schema/.gitignore
rename to xsl/slides/schema/.gitignore

diff --git a/slides/schema/Makefile b/xsl/slides/schema/Makefile
similarity index 100%
rename from slides/schema/Makefile
rename to xsl/slides/schema/Makefile

diff --git a/slides/schema/relaxng/.gitignore b/xsl/slides/schema/relaxng/.gitignore
similarity index 100%
rename from slides/schema/relaxng/.gitignore
rename to xsl/slides/schema/relaxng/.gitignore

diff --git a/slides/schema/relaxng/Makefile b/xsl/slides/schema/relaxng/Makefile
similarity index 100%
rename from slides/schema/relaxng/Makefile
rename to xsl/slides/schema/relaxng/Makefile

diff --git a/slides/schema/relaxng/slides.rnc b/xsl/slides/schema/relaxng/slides.rnc
similarity index 100%
rename from slides/schema/relaxng/slides.rnc
rename to xsl/slides/schema/relaxng/slides.rnc

diff --git a/slides/schema/xsd/Makefile b/xsl/slides/schema/xsd/Makefile
similarity index 100%
rename from slides/schema/xsd/Makefile
rename to xsl/slides/schema/xsd/Makefile

diff --git a/slides/tools/dbs3-upgrade.xsl b/xsl/slides/tools/dbs3-upgrade.xsl
similarity index 100%
rename from slides/tools/dbs3-upgrade.xsl
rename to xsl/slides/tools/dbs3-upgrade.xsl