gnome-settings-daemon r105 - in trunk: . gnome-settings-daemon plugins/a11y-keyboard plugins/background plugins/clipboard plugins/default-editor plugins/dummy plugins/font plugins/keybindings plugins/keyboard plugins/media-keys plugins/media-keys/actions plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings src

[jensg svn gnome org]

Author: jensg
Date: Tue Feb  5 17:24:51 2008
New Revision: 105
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=105&view=rev

Log:
2008-02-05  Jens Granseuer  <jensgr gmx net>

	Based on a patch by: Damien Carberry <damien carberry sun com>

	* Makefile.am:
	* autogen.sh:
	* configure.ac:
	* plugins/a11y-keyboard/Makefile.am:
	* plugins/background/Makefile.am:
	* plugins/clipboard/Makefile.am:
	* plugins/default-editor/Makefile.am:
	* plugins/dummy/Makefile.am:
	* plugins/font/Makefile.am:
	* plugins/keybindings/Makefile.am:
	* plugins/keyboard/Makefile.am:
	* plugins/media-keys/Makefile.am:
	* plugins/media-keys/actions/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:
	* src: rename the src folder to gnome-settings-daemon. This is needed
	so we can supply an uninstalled.pc file for g-s-d (see discussion in
	bug #511820)


Added:
   trunk/gnome-settings-daemon/
      - copied from r104, /trunk/src/
Removed:
   trunk/src/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.ac
   trunk/plugins/a11y-keyboard/Makefile.am
   trunk/plugins/background/Makefile.am
   trunk/plugins/clipboard/Makefile.am
   trunk/plugins/default-editor/Makefile.am
   trunk/plugins/dummy/Makefile.am
   trunk/plugins/font/Makefile.am
   trunk/plugins/keybindings/Makefile.am
   trunk/plugins/keyboard/Makefile.am
   trunk/plugins/media-keys/Makefile.am
   trunk/plugins/media-keys/actions/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/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -1,7 +1,7 @@
 NULL =
 
 SUBDIRS = 			\
-	src 			\
+	gnome-settings-daemon	\
 	plugins			\
 	data			\
 	po 			\

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Tue Feb  5 17:24:51 2008
@@ -10,10 +10,10 @@
 PKG_NAME="gnome-settings-daemon"
 
 (test -f $srcdir/configure.ac \
-  && test -d $srcdir/src \
-  && test -f $srcdir/src/gnome-settings-manager.h) || {
+  && test -d $srcdir/gnome-settings-daemon \
+  && test -f $srcdir/gnome-settings-daemon/gnome-settings-manager.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level gdm directory"
+    echo " top-level gnome-settings-daemon directory"
     exit 1
 }
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb  5 17:24:51 2008
@@ -8,7 +8,7 @@
         [2.21.90.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-settings-daemon])
 
-AC_CONFIG_SRCDIR([src/gnome-settings-manager.c])
+AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar])
 
@@ -361,7 +361,7 @@
 
 AC_OUTPUT([
 Makefile
-src/Makefile
+gnome-settings-daemon/Makefile
 plugins/Makefile
 plugins/a11y-keyboard/Makefile
 plugins/background/Makefile

Modified: trunk/plugins/a11y-keyboard/Makefile.am
==============================================================================
--- trunk/plugins/a11y-keyboard/Makefile.am	(original)
+++ trunk/plugins/a11y-keyboard/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 liba11y_keyboard_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/background/Makefile.am
==============================================================================
--- trunk/plugins/background/Makefile.am	(original)
+++ trunk/plugins/background/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -15,7 +15,7 @@
 	$(NULL)
 
 test_background_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-I$(top_srcdir)/plugins/background/libbackground   \
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
@@ -41,7 +41,7 @@
 	$(NULL)
 
 libbackground_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-I$(top_srcdir)/plugins/background/libbackground   \
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)

Modified: trunk/plugins/clipboard/Makefile.am
==============================================================================
--- trunk/plugins/clipboard/Makefile.am	(original)
+++ trunk/plugins/clipboard/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -16,7 +16,7 @@
 	$(NULL)
 
 libclipboard_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/default-editor/Makefile.am
==============================================================================
--- trunk/plugins/default-editor/Makefile.am	(original)
+++ trunk/plugins/default-editor/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 libdefault_editor_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/dummy/Makefile.am
==============================================================================
--- trunk/plugins/dummy/Makefile.am	(original)
+++ trunk/plugins/dummy/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 libdummy_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/font/Makefile.am
==============================================================================
--- trunk/plugins/font/Makefile.am	(original)
+++ trunk/plugins/font/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -14,7 +14,7 @@
 	$(NULL)
 
 libfont_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/keybindings/Makefile.am
==============================================================================
--- trunk/plugins/keybindings/Makefile.am	(original)
+++ trunk/plugins/keybindings/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -14,7 +14,7 @@
 	$(NULL)
 
 libkeybindings_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/keyboard/Makefile.am
==============================================================================
--- trunk/plugins/keyboard/Makefile.am	(original)
+++ trunk/plugins/keyboard/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -21,7 +21,7 @@
 	$(NULL)
 
 libkeyboard_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DDATADIR=\""$(pkgdatadir)"\"	\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -1,18 +1,12 @@
-NULL =
-
-SUBDIRS =		\
-	actions		\
-	$(NULL)
+SUBDIRS = actions
 
 plugin_LTLIBRARIES = \
-	libmedia-keys.la		\
-	$(NULL)
+	libmedia-keys.la
 
 BUILT_SOURCES = 			\
 	gsd-media-keys-manager-glue.h	\
 	gsd-marshal.h			\
-	gsd-marshal.c			\
-	$(NULL)
+	gsd-marshal.c
 
 gsd-media-keys-manager-glue.h: gsd-media-keys-manager.xml Makefile
 	dbus-binding-tool --prefix=gsd_media_keys_manager --mode=glib-server $< > xgen-$(@F) \
@@ -34,11 +28,10 @@
 	gsd-media-keys-window.c		\
 	eggaccelerators.h		\
 	eggaccelerators.c		\
-	$(BUILT_SOURCES)		\
-	$(NULL)
+	$(BUILT_SOURCES)
 
 libmedia_keys_la_CPPFLAGS = \
-	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_builddir)/plugins/media-keys/actions		\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
 	-DGLADEDIR=\""$(pkgdatadir)"\"				\
@@ -50,34 +43,29 @@
 	$(AM_CFLAGS)
 
 libmedia_keys_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)		\
-	$(NULL)
+	$(GSD_PLUGIN_LDFLAGS)
 
 libmedia_keys_la_LIBADD  = 		\
 	$(top_builddir)/plugins/media-keys/actions/libacme.la	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(XF86MISC_LIBS)		\
-	$(GST_LIBS)			\
-	$(NULL)
+	$(GST_LIBS)
 
 plugin_in_files = 		\
-	media-keys.gnome-settings-plugin.in	\
-	$(NULL)
+	media-keys.gnome-settings-plugin.in
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 noinst_PROGRAMS =				\
-	test-media-window			\
-	$(NULL)
+	test-media-window
 
 test_media_window_SOURCES =			\
 	gsd-media-keys-window.c			\
 	gsd-media-keys-window.h			\
-	test-media-window.c			\
-	$(NULL)
+	test-media-window.c
 
 test_media_window_CPPFLAGS = \
-	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_builddir)/plugins/media-keys/actions		\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
 	-DGLADEDIR=\""$(pkgdatadir)"\"				\
@@ -92,22 +80,18 @@
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(XF86MISC_LIBS)			\
-	$(GST_LIBS)				\
-	$(NULL)
+	$(GST_LIBS)
 
 EXTRA_DIST = 				\
 	gsd-media-keys-manager.xml	\
 	gsd-marshal.list		\
-	$(plugin_in_files)		\
-	$(NULL)
+	$(plugin_in_files)
 
 CLEANFILES = 			\
 	$(BUILT_SOURCES)	\
-	$(plugin_DATA)		\
-	$(NULL)
+	$(plugin_DATA)
 
 DISTCLEANFILES =		\
-	$(plugin_DATA)		\
-	$(NULL)
+	$(plugin_DATA)
 
 @GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/media-keys/actions/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/actions/Makefile.am	(original)
+++ trunk/plugins/media-keys/actions/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -11,7 +11,7 @@
 	$(NULL)
 
 libacme_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/mouse/Makefile.am
==============================================================================
--- trunk/plugins/mouse/Makefile.am	(original)
+++ trunk/plugins/mouse/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -16,7 +16,7 @@
 	$(NULL)
 
 libmouse_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/screensaver/Makefile.am
==============================================================================
--- trunk/plugins/screensaver/Makefile.am	(original)
+++ trunk/plugins/screensaver/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 libscreensaver_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -1,22 +1,16 @@
-NULL =
-
-SUBDIRS =		\
-	libsounds	\
-	$(NULL)
+SUBDIRS = libsounds
 
 plugin_LTLIBRARIES = \
-	libsound.la		\
-	$(NULL)
+	libsound.la
 
 libsound_la_SOURCES = 		\
 	gsd-sound-plugin.h	\
 	gsd-sound-plugin.c	\
 	gsd-sound-manager.h	\
-	gsd-sound-manager.c	\
-	$(NULL)
+	gsd-sound-manager.c
 
 libsound_la_CPPFLAGS = \
-	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_srcdir)/plugins/sounds/libsounds		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	$(AM_CPPFLAGS)
@@ -27,30 +21,24 @@
 	$(AM_CFLAGS)
 
 libsound_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)	\
-	$(NULL)
+	$(GSD_PLUGIN_LDFLAGS)
 
 libsound_la_LIBADD  = 		\
 	$(top_builddir)/plugins/sound/libsounds/libsounds.la	\
-	$(SETTINGS_PLUGIN_LIBS)	\
-	$(NULL)
+	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files = 		\
-	sound.gnome-settings-plugin.in	\
-	$(NULL)
+	sound.gnome-settings-plugin.in
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
-	$(plugin_in_files)	\
-	$(NULL)
+	$(plugin_in_files)
 
 CLEANFILES = 			\
-	$(plugin_DATA)		\
-	$(NULL)
+	$(plugin_DATA)
 
 DISTCLEANFILES =		\
-	$(plugin_DATA)		\
-	$(NULL)
+	$(plugin_DATA)
 
 @GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/typing-break/Makefile.am
==============================================================================
--- trunk/plugins/typing-break/Makefile.am	(original)
+++ trunk/plugins/typing-break/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 libtyping_break_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/xrandr/Makefile.am
==============================================================================
--- trunk/plugins/xrandr/Makefile.am	(original)
+++ trunk/plugins/xrandr/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -12,7 +12,7 @@
 	$(NULL)
 
 libxrandr_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 

Modified: trunk/plugins/xrdb/Makefile.am
==============================================================================
--- trunk/plugins/xrdb/Makefile.am	(original)
+++ trunk/plugins/xrdb/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -16,7 +16,7 @@
 	$(NULL)
 
 libxrdb_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DDATADIR=\""$(pkgdatadir)"\"	\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)

Modified: trunk/plugins/xsettings/Makefile.am
==============================================================================
--- trunk/plugins/xsettings/Makefile.am	(original)
+++ trunk/plugins/xsettings/Makefile.am	Tue Feb  5 17:24:51 2008
@@ -16,7 +16,7 @@
 	$(NULL)
 
 libxsettings_la_CPPFLAGS = \
-	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/gnome-settings-daemon		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)