GNOME.org
 

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

Author: chpe
Date: Wed Jan 30 14:37:55 2008
New Revision: 83
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=83&view=rev

Log:
2008-01-30  Christian Persch  <chpe gnome org>

	* configure.ac:
	* plugins/a11y-keyboard/Makefile.am:
	* plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.desktop
	.in:
	* plugins/background/Makefile.am:
	* plugins/background/background.gnome-settings-plugin.desktop.in:
	* plugins/clipboard/Makefile.am:
	* plugins/clipboard/clipboard.gnome-settings-plugin.desktop.in:
	* plugins/default-editor/Makefile.am:
	* plugins/default-editor/default-editor.gnome-settings-plugin.deskt
	op.in:
	* plugins/dummy/Makefile.am:
	* plugins/dummy/dummy.gnome-settings-plugin.desktop.in:
	* plugins/font/Makefile.am:
	* plugins/font/font.gnome-settings-plugin.desktop.in:
	* plugins/keybindings/Makefile.am:
	* plugins/keybindings/keybindings.gnome-settings-plugin.desktop.in:
	* plugins/keyboard/Makefile.am:
	* plugins/keyboard/keyboard.gnome-settings-plugin.desktop.in:
	* plugins/media-keys/Makefile.am:
	* plugins/media-keys/media-keys.gnome-settings-plugin.desktop.in:
	* plugins/mouse/Makefile.am:
	* plugins/mouse/mouse.gnome-settings-plugin.desktop.in:
	* plugins/screensaver/Makefile.am:
	* plugins/screensaver/screensaver.gnome-settings-plugin.desktop.in:
	* plugins/sound/Makefile.am:
	* plugins/sound/libsounds/Makefile.am:
	* plugins/sound/sound.gnome-settings-plugin.desktop.in:
	* plugins/typing-break/Makefile.am:
	* plugins/typing-break/typing-break.gnome-settings-plugin.desktop.i
	n:
	* plugins/xrandr/Makefile.am:
	* plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in:
	* plugins/xrdb/Makefile.am:
	* plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in:
	* plugins/xsettings/Makefile.am:
	* plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in:
	* po/POTFILES.in: No need to use weird naming of
	.gnome-settings-daemon.in files. Bug #512048.

Added:
   trunk/plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.desktop.in
   trunk/plugins/background/background.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/background/background.gnome-settings-plugin.desktop.in
   trunk/plugins/clipboard/clipboard.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/clipboard/clipboard.gnome-settings-plugin.desktop.in
   trunk/plugins/default-editor/default-editor.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/default-editor/default-editor.gnome-settings-plugin.desktop.in
   trunk/plugins/dummy/dummy.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/dummy/dummy.gnome-settings-plugin.desktop.in
   trunk/plugins/font/font.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/font/font.gnome-settings-plugin.desktop.in
   trunk/plugins/keybindings/keybindings.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/keybindings/keybindings.gnome-settings-plugin.desktop.in
   trunk/plugins/keyboard/keyboard.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/keyboard/keyboard.gnome-settings-plugin.desktop.in
   trunk/plugins/media-keys/media-keys.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/media-keys/media-keys.gnome-settings-plugin.desktop.in
   trunk/plugins/mouse/mouse.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/mouse/mouse.gnome-settings-plugin.desktop.in
   trunk/plugins/screensaver/screensaver.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/screensaver/screensaver.gnome-settings-plugin.desktop.in
   trunk/plugins/sound/sound.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/sound/sound.gnome-settings-plugin.desktop.in
   trunk/plugins/typing-break/typing-break.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/typing-break/typing-break.gnome-settings-plugin.desktop.in
   trunk/plugins/xrandr/xrandr.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in
   trunk/plugins/xrdb/xrdb.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in
   trunk/plugins/xsettings/xsettings.gnome-settings-plugin.in
      - copied unchanged from r82, /trunk/plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in
Removed:
   trunk/plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.desktop.in
   trunk/plugins/background/background.gnome-settings-plugin.desktop.in
   trunk/plugins/clipboard/clipboard.gnome-settings-plugin.desktop.in
   trunk/plugins/default-editor/default-editor.gnome-settings-plugin.desktop.in
   trunk/plugins/dummy/dummy.gnome-settings-plugin.desktop.in
   trunk/plugins/font/font.gnome-settings-plugin.desktop.in
   trunk/plugins/keybindings/keybindings.gnome-settings-plugin.desktop.in
   trunk/plugins/keyboard/keyboard.gnome-settings-plugin.desktop.in
   trunk/plugins/media-keys/media-keys.gnome-settings-plugin.desktop.in
   trunk/plugins/mouse/mouse.gnome-settings-plugin.desktop.in
   trunk/plugins/screensaver/screensaver.gnome-settings-plugin.desktop.in
   trunk/plugins/sound/sound.gnome-settings-plugin.desktop.in
   trunk/plugins/typing-break/typing-break.gnome-settings-plugin.desktop.in
   trunk/plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in
   trunk/plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in
   trunk/plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in
Modified:
   trunk/ChangeLog
   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/mouse/Makefile.am
   trunk/plugins/screensaver/Makefile.am
   trunk/plugins/sound/Makefile.am
   trunk/plugins/sound/libsounds/Makefile.am
   trunk/plugins/typing-break/Makefile.am
   trunk/plugins/xrandr/Makefile.am
   trunk/plugins/xrdb/Makefile.am
   trunk/plugins/xsettings/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 30 14:37:55 2008
@@ -6,7 +6,7 @@
 
 AC_CONFIG_SRCDIR([src/gnome-settings-manager.c])
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar])
 
 AM_MAINTAINER_MODE
 
@@ -19,7 +19,7 @@
 
 AC_SUBST(VERSION)
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
 IT_PROG_INTLTOOL([0.35.0])
 
@@ -29,6 +29,9 @@
 
 AM_GLIB_GNU_GETTEXT
 
+GSD_INTLTOOL_PLUGIN_RULE='%.gnome-settings-plugin:   %.gnome-settings-plugin.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST([GSD_INTLTOOL_PLUGIN_RULE])
+
 dnl ---------------------------------------------------------------------------
 dnl - Dependencies
 dnl ---------------------------------------------------------------------------
@@ -89,7 +92,7 @@
 if ! test -z "$with_dbus_sys" ; then
         DBUS_SYS_DIR="$with_dbus_sys"
 else
-        DBUS_SYS_DIR="$sysconfdir/dbus-1/system.d"
+        DBUS_SYS_DIR='${sysconfdir}/dbus-1/system.d'
 fi
 AC_SUBST(DBUS_SYS_DIR)
 

Modified: trunk/plugins/a11y-keyboard/Makefile.am
==============================================================================
--- trunk/plugins/a11y-keyboard/Makefile.am	(original)
+++ trunk/plugins/a11y-keyboard/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -37,12 +37,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	a11y-keyboard.gnome-settings-plugin.desktop.in	\
+	a11y-keyboard.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -56,3 +54,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/background/Makefile.am
==============================================================================
--- trunk/plugins/background/Makefile.am	(original)
+++ trunk/plugins/background/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -55,12 +55,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	background.gnome-settings-plugin.desktop.in	\
+	background.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -74,3 +72,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/clipboard/Makefile.am
==============================================================================
--- trunk/plugins/clipboard/Makefile.am	(original)
+++ trunk/plugins/clipboard/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -38,12 +38,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	clipboard.gnome-settings-plugin.desktop.in	\
+	clipboard.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -57,3 +55,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/default-editor/Makefile.am
==============================================================================
--- trunk/plugins/default-editor/Makefile.am	(original)
+++ trunk/plugins/default-editor/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -34,12 +34,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	default-editor.gnome-settings-plugin.desktop.in	\
+	default-editor.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -53,3 +51,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/dummy/Makefile.am
==============================================================================
--- trunk/plugins/dummy/Makefile.am	(original)
+++ trunk/plugins/dummy/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -34,12 +34,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	dummy.gnome-settings-plugin.desktop.in	\
+	dummy.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -53,3 +51,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/font/Makefile.am
==============================================================================
--- trunk/plugins/font/Makefile.am	(original)
+++ trunk/plugins/font/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -36,12 +36,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	font.gnome-settings-plugin.desktop.in	\
+	font.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -55,3 +53,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/keybindings/Makefile.am
==============================================================================
--- trunk/plugins/keybindings/Makefile.am	(original)
+++ trunk/plugins/keybindings/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -36,12 +36,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	keybindings.gnome-settings-plugin.desktop.in	\
+	keybindings.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -55,3 +53,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/keyboard/Makefile.am
==============================================================================
--- trunk/plugins/keyboard/Makefile.am	(original)
+++ trunk/plugins/keyboard/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -47,12 +47,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	keyboard.gnome-settings-plugin.desktop.in	\
+	keyboard.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -67,3 +65,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -66,12 +66,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	media-keys.gnome-settings-plugin.desktop.in	\
+	media-keys.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 noinst_PROGRAMS =				\
 	test-media-window			\
@@ -105,3 +103,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/mouse/Makefile.am
==============================================================================
--- trunk/plugins/mouse/Makefile.am	(original)
+++ trunk/plugins/mouse/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -38,12 +38,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	mouse.gnome-settings-plugin.desktop.in	\
+	mouse.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -57,3 +55,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/screensaver/Makefile.am
==============================================================================
--- trunk/plugins/screensaver/Makefile.am	(original)
+++ trunk/plugins/screensaver/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -34,12 +34,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	screensaver.gnome-settings-plugin.desktop.in	\
+	screensaver.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -53,3 +51,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -33,20 +33,18 @@
 	$(NULL)
 
 libsound_la_LIBADD  = 		\
-	$(SETTINGS_PLUGIN_LIBS)	\
 	$(top_builddir)/plugins/sound/libsounds/libsounds.la	\
+	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
 libsound_la_CFLAGS = 		\
 	$(NULL)
 
 plugin_in_files = 		\
-	sound.gnome-settings-plugin.desktop.in	\
+	sound.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -60,3 +58,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/sound/libsounds/Makefile.am
==============================================================================
--- trunk/plugins/sound/libsounds/Makefile.am	(original)
+++ trunk/plugins/sound/libsounds/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -11,4 +11,3 @@
 	sound-properties.h \
 	sound-view.c \
 	sound-view.h
-

Modified: trunk/plugins/typing-break/Makefile.am
==============================================================================
--- trunk/plugins/typing-break/Makefile.am	(original)
+++ trunk/plugins/typing-break/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -34,12 +34,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	typing-break.gnome-settings-plugin.desktop.in	\
+	typing-break.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -53,3 +51,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/xrandr/Makefile.am
==============================================================================
--- trunk/plugins/xrandr/Makefile.am	(original)
+++ trunk/plugins/xrandr/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -34,12 +34,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	xrandr.gnome-settings-plugin.desktop.in	\
+	xrandr.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -53,3 +51,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/xrdb/Makefile.am
==============================================================================
--- trunk/plugins/xrdb/Makefile.am	(original)
+++ trunk/plugins/xrdb/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -39,12 +39,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	xrdb.gnome-settings-plugin.desktop.in	\
+	xrdb.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -58,3 +56,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/plugins/xsettings/Makefile.am
==============================================================================
--- trunk/plugins/xsettings/Makefile.am	(original)
+++ trunk/plugins/xsettings/Makefile.am	Wed Jan 30 14:37:55 2008
@@ -38,12 +38,10 @@
 	$(NULL)
 
 plugin_in_files = 		\
-	xsettings.gnome-settings-plugin.desktop.in	\
+	xsettings.gnome-settings-plugin.in	\
 	$(NULL)
 
-%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin)
+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = 			\
 	$(plugin_in_files)	\
@@ -57,3 +55,4 @@
 	$(plugin_DATA)		\
 	$(NULL)
 
+ GSD_INTLTOOL_PLUGIN_RULE@

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Jan 30 14:37:55 2008
@@ -9,32 +9,32 @@
 data/apps_gnome_settings_daemon_screensaver.schemas.in
 data/desktop_gnome_font_rendering.schemas.in
 data/gnome-settings-daemon.schemas.in
-plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.in
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-plugins/background/background.gnome-settings-plugin.desktop.in
-plugins/clipboard/clipboard.gnome-settings-plugin.desktop.in
-plugins/default-editor/default-editor.gnome-settings-plugin.desktop.in
-plugins/dummy/dummy.gnome-settings-plugin.desktop.in
-plugins/font/font.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in
+[type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in
+[type: gettext/ini]plugins/default-editor/default-editor.gnome-settings-plugin.in
+[type: gettext/ini]plugins/dummy/dummy.gnome-settings-plugin.in
+[type: gettext/ini]plugins/font/font.gnome-settings-plugin.in
 plugins/font/gsd-font-manager.c
 plugins/keybindings/gsd-keybindings-manager.c
-plugins/keybindings/keybindings.gnome-settings-plugin.desktop.in
-plugins/keyboard/keyboard.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/keybindings/keybindings.gnome-settings-plugin.in
+[type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in
 plugins/keyboard/modmap-dialog.glade
 plugins/media-keys/actions/acme.glade
 plugins/media-keys/gsd-media-keys-manager.c
-plugins/media-keys/media-keys.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in
 plugins/mouse/gsd-mouse-manager.c
-plugins/mouse/mouse.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in
 plugins/screensaver/gsd-screensaver-manager.c
-plugins/screensaver/screensaver.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/screensaver/screensaver.gnome-settings-plugin.in
 plugins/sound/gsd-sound-manager.c
 plugins/sound/libsounds/sound-view.c
-plugins/sound/sound.gnome-settings-plugin.desktop.in
-plugins/typing-break/typing-break.gnome-settings-plugin.desktop.in
-plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/sound/sound.gnome-settings-plugin.in
+[type: gettext/ini]plugins/typing-break/typing-break.gnome-settings-plugin.in
+[type: gettext/ini]plugins/xrandr/xrandr.gnome-settings-plugin.in
 plugins/xrdb/gsd-xrdb-manager.c
-plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/xrdb/xrdb.gnome-settings-plugin.in
 plugins/xsettings/gsd-xsettings-manager.c
-plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in
+[type: gettext/ini]plugins/xsettings/xsettings.gnome-settings-plugin.in
 src/main.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]