Autofoo cleanups, prepare for combined theme package.

SVN revision: 27994
17 years ago · ef6f115f35
parent 99a90d0196
commit ef6f115f35
25 changed files with 65 additions and 80 deletions
--- a/BlueSteel/ChangeLog
+++ b/BlueSteel/ChangeLog
--- a/BlueSteel/Makefile.am
+++ b/BlueSteel/Makefile.am
@ -1,25 +1,29 @@
+AUTOMAKE_OPTIONS = foreign
+
+THEME = BlueSteel
+THEME_FILES = $(THEME).etheme

 ethemedir = $(datadir)/themes

-BUILT_SOURCES = @THEME@.etheme
-EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@
+BUILT_SOURCES = $(THEME).etheme
+EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES)

-THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
+THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME)

 install-data-local:
 	$(mkinstalldirs) $(THEME_DIR)
-	for tf in @THEME_FILES@; do \
+	for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 	done
 	-if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi

 uninstall-local:
-	-for tf in @THEME_FILES@; do \
+	-for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); \
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-.PHONY: etheme @THEME@.etheme
-etheme: @THEME@.etheme
-@THEME@.etheme:
-	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
+.PHONY: etheme $(THEME).etheme
+etheme: $(THEME).etheme
+$(THEME).etheme:
+	test ! -d data || (cd data; tar -czvf ../$(THEME).etheme --exclude CVS *)
--- a/BlueSteel/NEWS
+++ b/BlueSteel/NEWS
--- a/BlueSteel/README
+++ b/BlueSteel/README
--- a/BlueSteel/configure.in
+++ b/BlueSteel/configure.in
@ -13,8 +13,6 @@ if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=$prefix
 fi

-#ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
-
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

@ -27,11 +25,6 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
-THEME_FILES=`echo $THEME_FILES`
-AC_SUBST(THEME)
-AC_SUBST(THEME_FILES)
-
 AC_OUTPUT([
  Makefile
 ])
--- a/BrushedMetal-Tigert/ChangeLog
+++ b/BrushedMetal-Tigert/ChangeLog
--- a/BrushedMetal-Tigert/Makefile.am
+++ b/BrushedMetal-Tigert/Makefile.am
@ -1,25 +1,29 @@
+AUTOMAKE_OPTIONS = foreign
+
+THEME = BrushedMetal-Tigert
+THEME_FILES = $(THEME).etheme

 ethemedir = $(datadir)/themes

-BUILT_SOURCES = @THEME@.etheme
-EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@
+BUILT_SOURCES = $(THEME).etheme
+EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES)

-THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
+THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME)

 install-data-local:
 	$(mkinstalldirs) $(THEME_DIR)
-	for tf in @THEME_FILES@; do \
+	for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 	done
 	-if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi

 uninstall-local:
-	-for tf in @THEME_FILES@; do \
+	-for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); \
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-.PHONY: etheme @THEME@.etheme
-etheme: @THEME@.etheme
-@THEME@.etheme:
-	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
+.PHONY: etheme $(THEME).etheme
+etheme: $(THEME).etheme
+$(THEME).etheme:
+	test ! -d data || (cd data; tar -czvf ../$(THEME).etheme --exclude CVS *)
--- a/BrushedMetal-Tigert/NEWS
+++ b/BrushedMetal-Tigert/NEWS
--- a/BrushedMetal-Tigert/README
+++ b/BrushedMetal-Tigert/README
--- a/BrushedMetal-Tigert/configure.in
+++ b/BrushedMetal-Tigert/configure.in
@ -13,8 +13,6 @@ if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=$prefix
 fi

-#ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
-
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

@ -27,11 +25,6 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
-THEME_FILES=`echo $THEME_FILES`
-AC_SUBST(THEME)
-AC_SUBST(THEME_FILES)
-
 AC_OUTPUT([
  Makefile
 ])
--- a/Ganymede/ChangeLog
+++ b/Ganymede/ChangeLog
--- a/Ganymede/Makefile.am
+++ b/Ganymede/Makefile.am
@ -1,25 +1,29 @@
+AUTOMAKE_OPTIONS = foreign
+
+THEME = Ganymede
+THEME_FILES = $(THEME).etheme

 ethemedir = $(datadir)/themes

-BUILT_SOURCES = @THEME@.etheme
-EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@
+BUILT_SOURCES = $(THEME).etheme
+EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES)

-THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
+THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME)

 install-data-local:
 	$(mkinstalldirs) $(THEME_DIR)
-	for tf in @THEME_FILES@; do \
+	for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 	done
 	-if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi

 uninstall-local:
-	-for tf in @THEME_FILES@; do \
+	-for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); \
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-.PHONY: etheme @THEME@.etheme
-etheme: @THEME@.etheme
-@THEME@.etheme:
-	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
+.PHONY: etheme $(THEME).etheme
+etheme: $(THEME).etheme
+$(THEME).etheme:
+	test ! -d data || (cd data; tar -czvf ../$(THEME).etheme --exclude CVS *)
--- a/Ganymede/NEWS
+++ b/Ganymede/NEWS
--- a/Ganymede/README
+++ b/Ganymede/README
--- a/Ganymede/configure.in
+++ b/Ganymede/configure.in
@ -13,8 +13,6 @@ if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=$prefix
 fi

-#ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
-
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

@ -27,11 +25,6 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
-THEME_FILES=`echo $THEME_FILES`
-AC_SUBST(THEME)
-AC_SUBST(THEME_FILES)
-
 AC_OUTPUT([
  Makefile
 ])
--- a/ShinyMetal/ChangeLog
+++ b/ShinyMetal/ChangeLog
--- a/ShinyMetal/Makefile.am
+++ b/ShinyMetal/Makefile.am
@ -1,25 +1,29 @@
+AUTOMAKE_OPTIONS = foreign
+
+THEME = ShinyMetal
+THEME_FILES = $(THEME).etheme

 ethemedir = $(datadir)/themes

-BUILT_SOURCES = @THEME@.etheme
-EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@
+BUILT_SOURCES = $(THEME).etheme
+EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES)

-THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
+THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME)

 install-data-local:
 	$(mkinstalldirs) $(THEME_DIR)
-	for tf in @THEME_FILES@; do \
+	for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 	done
 	-if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi

 uninstall-local:
-	-for tf in @THEME_FILES@; do \
+	-for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); \
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-.PHONY: etheme @THEME@.etheme
-etheme: @THEME@.etheme
-@THEME@.etheme:
-	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
+.PHONY: etheme $(THEME).etheme
+etheme: $(THEME).etheme
+$(THEME).etheme:
+	test ! -d data || (cd data; tar -czvf ../$(THEME).etheme --exclude CVS *)
--- a/ShinyMetal/NEWS
+++ b/ShinyMetal/NEWS
--- a/ShinyMetal/README
+++ b/ShinyMetal/README
--- a/ShinyMetal/configure.in
+++ b/ShinyMetal/configure.in
@ -13,8 +13,6 @@ if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=$prefix
 fi

-#ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
-
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

@ -27,11 +25,6 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
-THEME_FILES=`echo $THEME_FILES`
-AC_SUBST(THEME)
-AC_SUBST(THEME_FILES)
-
 AC_OUTPUT([
  Makefile
 ])
--- a/winter/ChangeLog
+++ b/winter/ChangeLog
--- a/winter/Makefile.am
+++ b/winter/Makefile.am
@ -1,25 +1,29 @@
+AUTOMAKE_OPTIONS = foreign
+
+THEME = winter
+THEME_FILES = $(THEME).etheme

 ethemedir = $(datadir)/themes

-BUILT_SOURCES = @THEME@.etheme
-EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@
+BUILT_SOURCES = $(THEME).etheme
+EXTRA_DIST = etheme-$(THEME).spec $(THEME_FILES)

-THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
+THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/$(THEME)

 install-data-local:
 	$(mkinstalldirs) $(THEME_DIR)
-	for tf in @THEME_FILES@; do \
+	for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); tar -xmf -); \
 	done
 	-if [ -n "$(USER)" ]; then chown -R $(USER) $(THEME_DIR); else chown -R root $(THEME_DIR); fi

 uninstall-local:
-	-for tf in @THEME_FILES@; do \
+	-for tf in $(THEME_FILES); do \
 		gzip -d -c < $(srcdir)/$$tf | (cd $(THEME_DIR); \
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-.PHONY: etheme @THEME@.etheme
-etheme: @THEME@.etheme
-@THEME@.etheme:
-	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
+.PHONY: etheme $(THEME).etheme
+etheme: $(THEME).etheme
+$(THEME).etheme:
+	test ! -d data || (cd data; tar -czvf ../$(THEME).etheme --exclude CVS *)
--- a/winter/NEWS
+++ b/winter/NEWS
--- a/winter/README
+++ b/winter/README
--- a/winter/configure.in
+++ b/winter/configure.in
@ -13,8 +13,6 @@ if test "x$exec_prefix" = "xNONE"; then
  exec_prefix=$prefix
 fi

-#ALL_LINGUAS="de dk en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
-
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

@ -27,11 +25,6 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
-THEME_FILES=`echo $THEME_FILES`
-AC_SUBST(THEME)
-AC_SUBST(THEME_FILES)
-
 AC_OUTPUT([
  Makefile
 ])