gnome-settings-daemon r763 - in trunk: . gnome-settings-daemon plugins/a11y-keyboard plugins/background plugins/clipboard plugins/dummy plugins/font plugins/housekeeping plugins/keybindings plugins/keyboard plugins/media-keys plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings

From: jensg svn gnome org
To: svn-commits-list gnome org
Subject: gnome-settings-daemon r763 - in trunk: . gnome-settings-daemon plugins/a11y-keyboard plugins/background plugins/clipboard plugins/dummy plugins/font plugins/housekeeping plugins/keybindings plugins/keyboard plugins/media-keys plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings
Date: Sat, 7 Mar 2009 13:39:04 +0000 (UTC)
Author: jensg
Date: Sat Mar  7 13:39:04 2009
New Revision: 763
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=763&view=rev

Log:
2009-03-07  Jens Granseuer  <jensgr gmx net>

	Based on patch by: Christopher Taylor <christophth tiscali it>

	* gnome-settings-daemon/Makefile.am:
	* plugins/a11y-keyboard/Makefile.am:
	* plugins/background/Makefile.am:
	* plugins/clipboard/Makefile.am:
	* plugins/dummy/Makefile.am:
	* plugins/font/Makefile.am:
	* plugins/housekeeping/Makefile.am:
	* plugins/keybindings/Makefile.am:
	* plugins/keyboard/Makefile.am:
	* plugins/media-keys/Makefile.am:
	* plugins/mouse/Makefile.am:
	* plugins/screensaver/Makefile.am:
	* plugins/sound/Makefile.am:
	* plugins/typing-break/Makefile.am:
	* plugins/xrandr/Makefile.am:
	* plugins/xrdb/Makefile.am:
	* plugins/xsettings/Makefile.am: make build work with -Wl,-z,defs
	linker options (bug #574452)


Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/Makefile.am
   trunk/plugins/a11y-keyboard/Makefile.am
   trunk/plugins/background/Makefile.am
   trunk/plugins/clipboard/Makefile.am
   trunk/plugins/dummy/Makefile.am
   trunk/plugins/font/Makefile.am
   trunk/plugins/housekeeping/Makefile.am
   trunk/plugins/keybindings/Makefile.am
   trunk/plugins/keyboard/Makefile.am
   trunk/plugins/media-keys/Makefile.am
   trunk/plugins/mouse/Makefile.am
   trunk/plugins/screensaver/Makefile.am
   trunk/plugins/sound/Makefile.am
   trunk/plugins/typing-break/Makefile.am
   trunk/plugins/xrandr/Makefile.am
   trunk/plugins/xrdb/Makefile.am
   trunk/plugins/xsettings/Makefile.am

Modified: trunk/gnome-settings-daemon/Makefile.am
==============================================================================
--- trunk/gnome-settings-daemon/Makefile.am	(original)
+++ trunk/gnome-settings-daemon/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -11,27 +11,28 @@
 	$(NULL)
 
 noinst_LTLIBRARIES = 			\
-	libgsd-profile.la		\
+	libgsd-plugins.la		\
 	$(NULL)
 
-libgsd_profile_la_SOURCES =		\
+libgsd_plugins_la_SOURCES =		\
+	gnome-settings-plugin.c		\
+	gnome-settings-plugin.h		\
 	gnome-settings-profile.c	\
 	gnome-settings-profile.h	\
 	$(NULL)
 
-libgsd_profile_la_CPPFLAGS = 		\
+libgsd_plugins_la_CPPFLAGS = 		\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
 	$(NULL)
 
-libgsd_profile_la_CFLAGS =		\
-	$(SIMPLE_GREETER_CFLAGS)	\
+libgsd_plugins_la_CFLAGS =		\
 	$(NULL)
 
-libgsd_profile_la_LIBADD =		\
+libgsd_plugins_la_LIBADD =		\
 	$(NULL)
 
-libgsd_profile_la_LDFLAGS = 	\
-	-export-dynamic 	\
+libgsd_plugins_la_LDFLAGS = 		\
+	-export-dynamic 		\
 	$(NULL)
 
 gsddir = $(libexecdir)
@@ -59,8 +60,6 @@
 	main.c				\
 	gnome-settings-manager.c	\
 	gnome-settings-manager.h	\
-	gnome-settings-plugin.c		\
-	gnome-settings-plugin.h		\
 	gnome-settings-plugin-info.c	\
 	gnome-settings-plugin-info.h	\
 	gnome-settings-module.c		\
@@ -77,7 +76,7 @@
 	$(AM_LDFLAGS)
 
 gnome_settings_daemon_LDADD = 		\
-	libgsd-profile.la		\
+	libgsd-plugins.la		\
 	$(SETTINGS_DAEMON_LIBS)
 
 EXTRA_DIST = 				\

Modified: trunk/plugins/a11y-keyboard/Makefile.am
==============================================================================
--- trunk/plugins/a11y-keyboard/Makefile.am	(original)
+++ trunk/plugins/a11y-keyboard/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -60,6 +60,7 @@
 	$(NULL)
 
 liba11y_keyboard_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(XF86MISC_LIBS)		\
 	$(LIBNOTIFY_LIBS)		\

Modified: trunk/plugins/background/Makefile.am
==============================================================================
--- trunk/plugins/background/Makefile.am	(original)
+++ trunk/plugins/background/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -20,7 +20,7 @@
 	$(AM_CFLAGS)
 
 test_background_LDADD =		\
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la	\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
@@ -50,6 +50,7 @@
 	$(NULL)
 
 libbackground_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(NULL)
 

Modified: trunk/plugins/clipboard/Makefile.am
==============================================================================
--- trunk/plugins/clipboard/Makefile.am	(original)
+++ trunk/plugins/clipboard/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -29,6 +29,7 @@
 	$(NULL)
 
 libclipboard_la_LIBADD  = 	\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 

Modified: trunk/plugins/dummy/Makefile.am
==============================================================================
--- trunk/plugins/dummy/Makefile.am	(original)
+++ trunk/plugins/dummy/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -20,6 +20,7 @@
 	$(GSD_PLUGIN_LDFLAGS)
 
 libdummy_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files = 		\

Modified: trunk/plugins/font/Makefile.am
==============================================================================
--- trunk/plugins/font/Makefile.am	(original)
+++ trunk/plugins/font/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -23,6 +23,7 @@
 	$(AM_CFLAGS)
 
 libfont_la_LDFLAGS = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 

Modified: trunk/plugins/housekeeping/Makefile.am
==============================================================================
--- trunk/plugins/housekeeping/Makefile.am	(original)
+++ trunk/plugins/housekeeping/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -21,7 +21,11 @@
 
 libhousekeeping_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
 
-libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
+libhousekeeping_la_LIBADD = 	\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
+	$(SETTINGS_PLUGIN_LIBS)	\
+	$(GIOUNIX_LIBS)		\
+	$(LIBNOTIFY_LIBS)
 
 plugin_in_files = housekeeping.gnome-settings-plugin.in
 

Modified: trunk/plugins/keybindings/Makefile.am
==============================================================================
--- trunk/plugins/keybindings/Makefile.am	(original)
+++ trunk/plugins/keybindings/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -26,6 +26,7 @@
 	$(NULL)
 
 libkeybindings_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(top_builddir)/plugins/common/libcommon.la	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(NULL)

Modified: trunk/plugins/keyboard/Makefile.am
==============================================================================
--- trunk/plugins/keyboard/Makefile.am	(original)
+++ trunk/plugins/keyboard/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -36,6 +36,7 @@
 	$(NULL)
 
 libkeyboard_la_LIBADD  = 	\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(XF86MISC_LIBS)	\
 	$(LIBGNOMEKBD_LIBS)	\

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -53,6 +53,7 @@
 	$(GSD_PLUGIN_LDFLAGS)
 
 libmedia_keys_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
 	$(SETTINGS_PLUGIN_LIBS)						\
@@ -115,7 +116,7 @@
 	$(AM_CFLAGS)
 
 test_media_keys_LDADD = \
-	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\

Modified: trunk/plugins/mouse/Makefile.am
==============================================================================
--- trunk/plugins/mouse/Makefile.am	(original)
+++ trunk/plugins/mouse/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -23,6 +23,7 @@
 	$(GSD_PLUGIN_LDFLAGS)
 
 libmouse_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(XINPUT_LIBS)
 

Modified: trunk/plugins/screensaver/Makefile.am
==============================================================================
--- trunk/plugins/screensaver/Makefile.am	(original)
+++ trunk/plugins/screensaver/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -25,6 +25,7 @@
 	$(NULL)
 
 libscreensaver_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -22,6 +22,7 @@
 	$(GSD_PLUGIN_LDFLAGS)
 
 libsound_la_LIBADD = \
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(PULSE_LIBS)
 

Modified: trunk/plugins/typing-break/Makefile.am
==============================================================================
--- trunk/plugins/typing-break/Makefile.am	(original)
+++ trunk/plugins/typing-break/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -25,6 +25,7 @@
 	$(NULL)
 
 libtyping_break_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 

Modified: trunk/plugins/xrandr/Makefile.am
==============================================================================
--- trunk/plugins/xrandr/Makefile.am	(original)
+++ trunk/plugins/xrandr/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -59,6 +59,7 @@
 	$(GSD_PLUGIN_LDFLAGS)
 
 libxrandr_la_LIBADD  =			\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(LIBNOTIFY_LIBS)		\
 	$(RANDR_LIBS)

Modified: trunk/plugins/xrdb/Makefile.am
==============================================================================
--- trunk/plugins/xrdb/Makefile.am	(original)
+++ trunk/plugins/xrdb/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -30,6 +30,7 @@
 	$(NULL)
 
 libxrdb_la_LIBADD  = 		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 

Modified: trunk/plugins/xsettings/Makefile.am
==============================================================================
--- trunk/plugins/xsettings/Makefile.am	(original)
+++ trunk/plugins/xsettings/Makefile.am	Sat Mar  7 13:39:04 2009
@@ -29,6 +29,7 @@
 	$(NULL)
 
 libxsettings_la_LIBADD  = 	\
+	$(top_builddir)/gnome-settings-daemon/libgsd-plugins.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]