Fixes for make dist

10 files changed, 16 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 93175459..13da5522 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS = \
 	po
 
 EXTRA_DIST = \
-	mate-themes.spec \
-	mate-themes.spec.in \
 	low-contrast-preset.scm \
 	intltool-extract.in \
 	intltool-merge.in \
diff --git a/configure.ac b/configure.ac
index 077aba79..9d6947ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.53)
 AC_INIT([mate-themes], [1.6.0], [http://www.mate-desktop.org])
 AC_CONFIG_SRCDIR([icon-themes])
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz])
 
 # Enable silent build rules by default, requires at least
 # Automake-1.11. Disable by either passing --disable-silent-rules to
@@ -29,8 +29,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 # Check GTK+ theme engines
 PKG_CHECK_MODULES(THEME_ENGINE,
  [gtk+-2.0 >= 2.0.0 dnl
-  gdk-pixbuf-2.0 >= 2.0.0 dnl
-  gtk-engines-2 >= 2.15.3 ])
+  gdk-pixbuf-2.0 >= 2.0.0 ])
 
 GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
 AC_SUBST(GTK_VERSION)
diff --git a/desktop-themes/BlackMATE/Makefile.am b/desktop-themes/BlackMATE/Makefile.am
index c6b539a5..3bd40c9f 100644
--- a/desktop-themes/BlackMATE/Makefile.am
+++ b/desktop-themes/BlackMATE/Makefile.am
@@ -5,7 +5,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 theme_DATA = index.theme \
 			README
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/ContrastHigh/Makefile.am b/desktop-themes/ContrastHigh/Makefile.am
index fb334d3c..d32b516b 100644
--- a/desktop-themes/ContrastHigh/Makefile.am
+++ b/desktop-themes/ContrastHigh/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS = \
    gtk-3.0 \
diff --git a/desktop-themes/GreenLaguna/Makefile.am b/desktop-themes/GreenLaguna/Makefile.am
index 50b74985..0d558894 100644
--- a/desktop-themes/GreenLaguna/Makefile.am
+++ b/desktop-themes/GreenLaguna/Makefile.am
@@ -5,7 +5,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 theme_DATA = index.theme \
 			README
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/Menta/Makefile.am b/desktop-themes/Menta/Makefile.am
index b0c40d32..9cf08f1f 100644
--- a/desktop-themes/Menta/Makefile.am
+++ b/desktop-themes/Menta/Makefile.am
@@ -7,8 +7,7 @@ theme_DATA = \
 	index.theme \
 	README
 
-
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS = \
 	cinnamon \
diff --git a/desktop-themes/TraditionalGreen/Makefile.am b/desktop-themes/TraditionalGreen/Makefile.am
index 84321bff..6b9e4a6b 100644
--- a/desktop-themes/TraditionalGreen/Makefile.am
+++ b/desktop-themes/TraditionalGreen/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/desktop-themes/TraditionalOk/Makefile.am b/desktop-themes/TraditionalOk/Makefile.am
index 31d141ff..d8a2bd09 100644
--- a/desktop-themes/TraditionalOk/Makefile.am
+++ b/desktop-themes/TraditionalOk/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	doc			\
diff --git a/desktop-themes/TraditionalOkTest/Makefile.am b/desktop-themes/TraditionalOkTest/Makefile.am
index c55eef34..3ef2aadc 100644
--- a/desktop-themes/TraditionalOkTest/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/Makefile.am
@@ -4,7 +4,7 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 
 theme_DATA = index.theme
 
-EXTRA_DIST = $(theme_DATA)
+EXTRA_DIST = $(theme_DATA) index.theme.in
 
 SUBDIRS =		\
 	gtk-2.0		\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3862099..3be2b63c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,21 +1,21 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-desktop-themes/Aldabra/index.theme.in
-desktop-themes/TraditionalOk/index.theme.in
-desktop-themes/TraditionalOkTest/index.theme.in
-desktop-themes/Quid/index.theme.in
 desktop-themes/AlaDelta/index.theme.in
-desktop-themes/Shiny/index.theme.in
+desktop-themes/Quid/index.theme.in
 desktop-themes/ContrastHigh/index.theme.in
 desktop-themes/ContrastHighInverse/index.theme.in
 desktop-themes/ContrastHighLargePrint/index.theme.in.in
 desktop-themes/ContrastHighLargePrintInverse/index.theme.in.in
-desktop-themes/LargePrint/index.theme.in.in
 desktop-themes/ContrastLow/index.theme.in
 desktop-themes/ContrastLowLargePrint/index.theme.in.in
 desktop-themes/Fog/index.theme.in
-icon-themes/Quid/index.theme.in
+desktop-themes/LargePrint/index.theme.in.in
+desktop-themes/Shiny/index.theme.in
+desktop-themes/TraditionalGreen/index.theme.in
+desktop-themes/TraditionalOk/index.theme.in
+desktop-themes/TraditionalOkTest/index.theme.in
 icon-themes/ContrastHigh-SVG/index.theme.in
 icon-themes/ContrastHighLargePrint/index.theme.in
 icon-themes/ContrastHighLargePrintInverse/index.theme.in
 icon-themes/Fog/index.theme.in
+icon-themes/Quid/index.theme.in