[Xfce4-commits] <xfwm4:master> Fix dist check.

[Nick Schermer]

Updating branch refs/heads/master
         to d9140051e5c1e57344218db91efa4f39edeeeec4 (commit)
       from 68138971a319b01cedebd6d807b62e1167103d7c (commit)

commit d9140051e5c1e57344218db91efa4f39edeeeec4
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 7 14:49:40 2010 +0100

    Fix dist check.

 settings-dialogs/Makefile.am |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index 7c94838..0962e97 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -1,18 +1,11 @@
 bin_PROGRAMS = \
-xfwm4-settings  \
-xfwm4-tweaks-settings  \
-xfwm4-workspace-settings
-
-noinst_DATA = \
-	monitor-icon.png \
-	monitor-icon.svg \
-	monitor-icon.h
+	xfwm4-settings  \
+	xfwm4-tweaks-settings  \
+	xfwm4-workspace-settings
 
 xfwm4_workspace_settings_SOURCES = \
 	workspace-settings.c \
-	xfwm4-workspace-dialog_glade.h \
-	monitor-icon.png \
-	monitor-icon.svg \
+	xfwm4-workspace-dialog_ui.h \
 	monitor-icon.h
 
 xfwm4_workspace_settings_CFLAGS = \
@@ -40,7 +33,7 @@ xfwm4_workspace_settings_LDADD = \
 xfwm4_settings_SOURCES = \
 	xfwm4-settings.c \
 	xfwm4-settings.h \
-	xfwm4-dialog_glade.h
+	xfwm4-dialog_ui.h
 
 xfwm4_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
@@ -63,7 +56,7 @@ xfwm4_settings_LDADD = \
 
 xfwm4_tweaks_settings_SOURCES = \
 	tweaks-settings.c \
-	xfwm4-tweaks-dialog_glade.h
+	xfwm4-tweaks-dialog_ui.h
 
 xfwm4_tweaks_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
@@ -88,10 +81,10 @@ INCLUDES = \
 if MAINTAINER_MODE
 
 BUILT_SOURCES = \
-monitor-icon.h \
-xfwm4-dialog_ui.h \
-xfwm4-tweaks-dialog_ui.h \
-xfwm4-workspace-dialog_ui.h
+	monitor-icon.h \
+	xfwm4-dialog_ui.h \
+	xfwm4-tweaks-dialog_ui.h \
+	xfwm4-workspace-dialog_ui.h
 
 xfwm4-workspace-dialog_ui.h: xfwm4-workspace-dialog.glade
 	exo-csource --static --strip-comments --strip-content --name=workspace_dialog_ui $< >$@
@@ -121,7 +114,8 @@ EXTRA_DIST = \
 	$(desktop_in_files)  \
 	xfwm4-workspace-dialog.glade  \
 	xfwm4-tweaks-dialog.glade  \
-	xfwm4-dialog.glade
+	xfwm4-dialog.glade \
+	monitor-icon.png
 
 DISTCLEANFILES = \
 	$(desktop_DATA)