[Xfce4-commits] r30278 - in xfce4-settings/branches/migration-to-4ui: dialogs/accessibility-settings dialogs/appearance-settings dialogs/display-settings dialogs/keyboard-settings dialogs/mouse-settings xfce4-settings-editor xfce4-settings-manager xfsettingsd

[Nick Schermer]

Author: nick
Date: 2009-07-11 12:15:44 +0000 (Sat, 11 Jul 2009)
New Revision: 30278

Modified:
   xfce4-settings/branches/migration-to-4ui/dialogs/accessibility-settings/Makefile.am
   xfce4-settings/branches/migration-to-4ui/dialogs/appearance-settings/Makefile.am
   xfce4-settings/branches/migration-to-4ui/dialogs/display-settings/Makefile.am
   xfce4-settings/branches/migration-to-4ui/dialogs/keyboard-settings/Makefile.am
   xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am
   xfce4-settings/branches/migration-to-4ui/xfce4-settings-editor/Makefile.am
   xfce4-settings/branches/migration-to-4ui/xfce4-settings-manager/Makefile.am
   xfce4-settings/branches/migration-to-4ui/xfsettingsd/Makefile.am
Log:
Fix some Makefile issues.


Modified: xfce4-settings/branches/migration-to-4ui/dialogs/accessibility-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/accessibility-settings/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/accessibility-settings/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -18,7 +18,8 @@
 xfce4_accessibility_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_accessibility_settings_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/dialogs/appearance-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/appearance-settings/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/appearance-settings/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -19,7 +19,8 @@
 xfce4_appearance_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_appearance_settings_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/dialogs/display-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/display-settings/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/display-settings/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -23,7 +23,8 @@
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(XFCONF_CFLAGS) \
-	$(XRANDR_CFLAGS)
+	$(XRANDR_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_display_settings_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/dialogs/keyboard-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/keyboard-settings/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/keyboard-settings/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -27,7 +27,8 @@
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
 	$(EXO_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_keyboard_settings_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -21,7 +21,8 @@
 	$(LIBXFCE4UI_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(XI_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_mouse_settings_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/xfce4-settings-editor/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/xfce4-settings-editor/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/xfce4-settings-editor/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -21,7 +21,8 @@
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(XFCONF_CFLAGS) \
-	$(EXO_CFLAGS)
+	$(EXO_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_settings_editor_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/xfce4-settings-manager/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/xfce4-settings-manager/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/xfce4-settings-manager/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -23,7 +23,8 @@
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(XFCONF_CFLAGS) \
-	$(EXO_CFLAGS)
+	$(EXO_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 xfce4_settings_manager_LDFLAGS = \
 	-no-undefined \

Modified: xfce4-settings/branches/migration-to-4ui/xfsettingsd/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/xfsettingsd/Makefile.am	2009-07-11 12:06:04 UTC (rev 30277)
+++ xfce4-settings/branches/migration-to-4ui/xfsettingsd/Makefile.am	2009-07-11 12:15:44 UTC (rev 30278)
@@ -1,10 +1,23 @@
+# $Id$
+
 if BUILD_XFSETTINGSD
 
-bin_PROGRAMS = xfsettingsd
+INCLUDES = \
+	-I${top_srcdir} \
+	-DDATADIR=\"$(datadir)\" \
+	-DBINDIR=\"$(bindir)\" \
+	-DSRCDIR=\"$(top_srcdir)\" \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DG_LOG_DOMAIN=\"xfsettingsd\" \
+	$(PLATFORM_CPPFLAGS)
 
+bin_PROGRAMS = \
+	xfsettingsd
+
 xfsettingsd_SOURCES = \
 	main.c \
-	registry.c registry.h
+	registry.c \
+	registry.h
 
 xfsettingsd_CFLAGS = \
 	$(GTK_CFLAGS) \
@@ -12,10 +25,12 @@
 	$(LIBNOTIFY_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
-	-DDATADIR=\"$(datadir)\" \
-	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\"
+	$(PLATFORM_CFLAGS)
 
+xfsettingsd_LDFLAGS = \
+	-no-undefined \
+	$(PLATFORM_LDFLAGS)
+
 xfsettingsd_LDADD = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
@@ -23,14 +38,10 @@
 	$(XFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS)
 
-INCLUDES = \
-	-I$(top_srcdir)
-
 settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
 settings_DATA = xsettings.xml
 
 EXTRA_DIST = \
 	$(settings_DATA)
 
-
 endif