16 files changed, 118 insertions, 137 deletions
diff --git a/desktop-themes/BlackMATE-border/Makefile.am b/desktop-themes/BlackMATE-border/Makefile.am
index 992bd915..1498edf8 100644
--- a/desktop-themes/BlackMATE-border/Makefile.am
+++ b/desktop-themes/BlackMATE-border/Makefile.am
@@ -1,10 +1,6 @@
-THEME_NAME=BlackMATE-border
+THEME_NAME = BlackMATE-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-$(theme_DATA): $(THEME_IN_FILES)
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS = \
-	metacity-1
+SUBDIRS = metacity-1
 
diff --git a/desktop-themes/BlackMATE/Makefile.am b/desktop-themes/BlackMATE/Makefile.am
index 00ee5d67..f5942a38 100644
--- a/desktop-themes/BlackMATE/Makefile.am
+++ b/desktop-themes/BlackMATE/Makefile.am
@@ -1,23 +1,23 @@
-THEME_NAME=	BlackMATE
-THEME_IN_FILES=index.theme.in
+THEME_NAME = BlackMATE
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme \
-	README
+theme_DATA = COPYING index.theme README
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	gtk-2.0		\
 	gtk-3.0		\
 	metacity-1	\
-	cinnamon    \
-	unity       \
+	cinnamon	\
+	unity		\
 	apps
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/Blue-Submarine-border/Makefile.am b/desktop-themes/Blue-Submarine-border/Makefile.am
index 4b197961..01825e38 100644
--- a/desktop-themes/Blue-Submarine-border/Makefile.am
+++ b/desktop-themes/Blue-Submarine-border/Makefile.am
@@ -1,10 +1,6 @@
-THEME_NAME=Blue-Submarine-border
+THEME_NAME = Blue-Submarine-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-$(theme_DATA): $(THEME_IN_FILES)
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS = \
-	metacity-1
+SUBDIRS = metacity-1
 
diff --git a/desktop-themes/Blue-Submarine/Makefile.am b/desktop-themes/Blue-Submarine/Makefile.am
index e70fee01..1c3e8029 100644
--- a/desktop-themes/Blue-Submarine/Makefile.am
+++ b/desktop-themes/Blue-Submarine/Makefile.am
@@ -1,19 +1,22 @@
-THEME_NAME=Blue-Submarine
-THEME_IN_FILES=index.theme.in
+THEME_NAME = Blue-Submarine
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_in_files = index.theme.in
+theme_DATA = $(theme_in_files:.theme.in=.theme)
 
-theme_DATA = index.theme
-
-$(theme_DATA): $(THEME_IN_FILES)
+%.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	cinnamon	\
-	emerald     \
+	emerald		\
 	gtk-2.0		\
 	gtk-3.0		\
 	metacity-1
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/BlueMenta-border/Makefile.am b/desktop-themes/BlueMenta-border/Makefile.am
index d476c1a3..ef1cc12a 100644
--- a/desktop-themes/BlueMenta-border/Makefile.am
+++ b/desktop-themes/BlueMenta-border/Makefile.am
@@ -1,14 +1,7 @@
-THEME_NAME=BlueMenta-border
+THEME_NAME = BlueMenta-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_DATA = COPYING README
 
-theme_DATA = \
-	COPYING \
-	README
-
-%.theme: %.theme.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS =		\
-	metacity-1
+SUBDIRS = metacity-1
 
diff --git a/desktop-themes/BlueMenta/Makefile.am b/desktop-themes/BlueMenta/Makefile.am
index ad296ffe..3c26d9de 100644
--- a/desktop-themes/BlueMenta/Makefile.am
+++ b/desktop-themes/BlueMenta/Makefile.am
@@ -1,24 +1,24 @@
-THEME_NAME=BlueMenta
-THEME_IN_FILES=index.theme.in
+THEME_NAME = BlueMenta
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme \
-	README
+theme_DATA = COPYING index.theme README
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
-SUBDIRS =		\
+SUBDIRS = \
 	cinnamon \
 	emerald \
-	gtk-2.0		\
-	gtk-3.0		\
+	gtk-2.0 \
+	gtk-3.0 \
 	metacity-1 \
-	unity	\
+	unity \
 	xfwm4
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/ContrastHigh/Makefile.am b/desktop-themes/ContrastHigh/Makefile.am
index 250686b4..12126009 100644
--- a/desktop-themes/ContrastHigh/Makefile.am
+++ b/desktop-themes/ContrastHigh/Makefile.am
@@ -1,12 +1,15 @@
-THEME_NAME=ContrastHigh
-THEME_IN_FILES=index.theme.in
+THEME_NAME = ContrastHigh
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_in_files = index.theme.in
+theme_DATA = $(theme_in_files:.theme.in=.theme)
 
-theme_DATA = index.theme
-
-$(theme_DATA): $(THEME_IN_FILES)
+%.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/Green-Submarine-border/Makefile.am b/desktop-themes/Green-Submarine-border/Makefile.am
index c22168cf..1a36b8a2 100644
--- a/desktop-themes/Green-Submarine-border/Makefile.am
+++ b/desktop-themes/Green-Submarine-border/Makefile.am
@@ -1,10 +1,6 @@
-THEME_NAME=Green-Submarine-border
+THEME_NAME = Green-Submarine-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
 
-$(theme_DATA): $(THEME_IN_FILES)
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS = \
-	metacity-1
+SUBDIRS = metacity-1
 
diff --git a/desktop-themes/Green-Submarine/Makefile.am b/desktop-themes/Green-Submarine/Makefile.am
index 0cb9e35f..ab8e44ce 100644
--- a/desktop-themes/Green-Submarine/Makefile.am
+++ b/desktop-themes/Green-Submarine/Makefile.am
@@ -1,19 +1,22 @@
-THEME_NAME=Green-Submarine
-THEME_IN_FILES=index.theme.in
+THEME_NAME = Green-Submarine
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_in_files = index.theme.in
+theme_DATA = $(theme_in_files:.theme.in=.theme)
 
-theme_DATA = index.theme
-
-$(theme_DATA): $(THEME_IN_FILES)
+%.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	cinnamon	\
-	emerald     \
+	emerald		\
 	gtk-2.0		\
 	gtk-3.0		\
 	metacity-1
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/GreenLaguna-border/Makefile.am b/desktop-themes/GreenLaguna-border/Makefile.am
index 82c32b40..3d8696ae 100644
--- a/desktop-themes/GreenLaguna-border/Makefile.am
+++ b/desktop-themes/GreenLaguna-border/Makefile.am
@@ -1,13 +1,6 @@
-THEME_NAME=GreenLaguna-border
+THEME_NAME = GreenLaguna-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_DATA = COPYING
 
-theme_DATA = \
-	COPYING
-
-%.theme: %.theme.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS = \
-	metacity-1
-
+SUBDIRS = metacity-1
diff --git a/desktop-themes/GreenLaguna/Makefile.am b/desktop-themes/GreenLaguna/Makefile.am
index 049fbad8..7cefed57 100644
--- a/desktop-themes/GreenLaguna/Makefile.am
+++ b/desktop-themes/GreenLaguna/Makefile.am
@@ -1,21 +1,21 @@
-THEME_NAME=GreenLaguna
-THEME_IN_FILES=index.theme.in
+THEME_NAME = GreenLaguna
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme \
-	README
+theme_DATA = COPYING index.theme README
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	gtk-2.0		\
 	gtk-3.0		\
-	metacity-1  \
+	metacity-1	\
 	unity
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/HighContrastInverse/Makefile.am b/desktop-themes/HighContrastInverse/Makefile.am
index 5fcd8883..c51d60cb 100644
--- a/desktop-themes/HighContrastInverse/Makefile.am
+++ b/desktop-themes/HighContrastInverse/Makefile.am
@@ -1,17 +1,20 @@
-THEME_NAME=HighContrastInverse
-THEME_IN_FILES=index.theme.in
+THEME_NAME = HighContrastInverse
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_in_files = index.theme.in
+theme_DATA = $(theme_in_files:.theme.in=.theme)
 
-theme_DATA = index.theme
-
-$(theme_DATA): $(THEME_IN_FILES)
+%.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =      \
 	gtk-2.0	   \
 	metacity-1 \
 	pixmaps
 
-DISTCLEANFILES=index.theme
-EXTRA_DIST=index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/Menta-border/Makefile.am b/desktop-themes/Menta-border/Makefile.am
index ce0503e5..64b4dcfb 100644
--- a/desktop-themes/Menta-border/Makefile.am
+++ b/desktop-themes/Menta-border/Makefile.am
@@ -1,14 +1,7 @@
-THEME_NAME=Menta-border
+THEME_NAME = Menta-border
 
 themedir = $(datadir)/themes/$(THEME_NAME)
+theme_DATA = COPYING README
 
-theme_DATA = \
-	COPYING \
-	README
-
-%.theme: %.theme.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-SUBDIRS = \
-	metacity-1
+SUBDIRS = metacity-1
 
diff --git a/desktop-themes/Menta/Makefile.am b/desktop-themes/Menta/Makefile.am
index ca84f46b..cdc7dc86 100644
--- a/desktop-themes/Menta/Makefile.am
+++ b/desktop-themes/Menta/Makefile.am
@@ -1,15 +1,15 @@
-THEME_NAME=Menta
-THEME_IN_FILES=index.theme.in
+THEME_NAME = Menta
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme \
-	README
+theme_DATA = COPYING index.theme README
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS = \
 	cinnamon \
@@ -20,5 +20,5 @@ SUBDIRS = \
 	unity \
 	xfwm4
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/TraditionalGreen/Makefile.am b/desktop-themes/TraditionalGreen/Makefile.am
index 42638043..7ac9766d 100644
--- a/desktop-themes/TraditionalGreen/Makefile.am
+++ b/desktop-themes/TraditionalGreen/Makefile.am
@@ -1,19 +1,20 @@
-THEME_NAME=TraditionalGreen
-THEME_IN_FILES=index.theme.in
+THEME_NAME = TraditionalGreen
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme
+theme_DATA = COPYING index.theme
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	gtk-2.0		\
 	gtk-3.0		\
 	metacity-1
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)
diff --git a/desktop-themes/TraditionalOk/Makefile.am b/desktop-themes/TraditionalOk/Makefile.am
index 8956a277..9492b9fa 100644
--- a/desktop-themes/TraditionalOk/Makefile.am
+++ b/desktop-themes/TraditionalOk/Makefile.am
@@ -1,14 +1,15 @@
-THEME_NAME=TraditionalOk
-THEME_IN_FILES=index.theme.in
+THEME_NAME = TraditionalOk
 
+theme_in_files = index.theme.in
 themedir = $(datadir)/themes/$(THEME_NAME)
-
-theme_DATA = \
-	COPYING \
-	index.theme
+theme_DATA = COPYING index.theme
 
 %.theme: %.theme.in
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 SUBDIRS =		\
 	gtk-2.0		\
@@ -17,5 +18,5 @@ SUBDIRS =		\
 	openbox-3	\
 	xfwm4
 
-DISTCLEANFILES = index.theme
-EXTRA_DIST = index.theme.in
+CLEANFILES = index.theme
+EXTRA_DIST = $(theme_in_files)