Deconditionalize adding extra files to dist

compiz-reloaded · Mar 24, 2016 · 1d2ce65 · 1d2ce65
1 parent 03873f3
commit 1d2ce65
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/gtk/mate/Makefile.am b/gtk/mate/Makefile.am
@@ -1,3 +1,6 @@
+EXTRA_DIST =		  \
+	compiz.desktop.in
+
 if USE_MATE
 desktopfilesdir	      = $(DESTDIR)$(datadir)/applications
 desktopfiles_in_files = compiz.desktop.in
@@ -22,7 +25,5 @@ endif
 noinst_DATA =		      \
 	$(desktopfiles_files)
 
-EXTRA_DIST =			 \
-	$(desktopfiles_in_files)
 DISTCLEANFILES = \
 	$(noinst_DATA)
diff --git a/gtk/window-decorator/Makefile.am b/gtk/window-decorator/Makefile.am
@@ -23,11 +23,11 @@ if USE_GSETTINGS
 gsettings_SCHEMAS = org.compiz-0.gwd.gschema.xml
 
 @GSETTINGS_RULES@
-
-EXTRA_DIST = \
-	$(gsettings_SCHEMAS)
 endif
 
+EXTRA_DIST =			     \
+	org.compiz-0.gwd.gschema.xml
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include            \
 	@GTK_WINDOW_DECORATOR_CFLAGS@      \

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -31,6 +31,9 @@ compiz_SOURCES =   \
 	match.c    \
 	metadata.c
 
+EXTRA_DIST =                     \
+	compiz-start.desktop.in
+
 if USE_MENU_ENTRIES
 desktopfilesdir       = $(DESTDIR)$(datadir)/applications
 desktopfiles_in_files = compiz-start.desktop.in
@@ -53,7 +56,4 @@ uninstall-local:
 
 noinst_DATA =                 \
 	$(desktopfiles_files)
-
-EXTRA_DIST =                     \
-	$(desktopfiles_in_files)
 endif