gnome-settings-daemon r60 - in trunk: . plugins/media-keys

[chpe svn gnome org]

Author: chpe
Date: Fri Jan 25 13:39:15 2008
New Revision: 60
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=60&view=rev

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

	* plugins/media-keys/Makefile.am: Fix build with builddir != srcdir.
	BUg #509142.

Modified:
   trunk/ChangeLog
   trunk/plugins/media-keys/Makefile.am

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Fri Jan 25 13:39:15 2008
@@ -27,14 +27,16 @@
 	gsd-marshal.c			\
 	$(NULL)
 
-gsd-media-keys-manager-glue.h: gsd-media-keys-manager.xml Makefile.am
-	dbus-binding-tool --prefix=gsd_media_keys_manager --mode=glib-server --output=gsd-media-keys-manager-glue.h gsd-media-keys-manager.xml
+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) \
+	&& ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \
+	&& rm -f xgen-$(@F)
 
 gsd-marshal.c: gsd-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=gsd_marshal $< --header --body > $@
+	$(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@
 
 gsd-marshal.h: gsd-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=gsd_marshal $< --header > $@
+	$(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@
 
 libmedia_keys_la_SOURCES = 		\
 	gsd-media-keys-plugin.h		\
@@ -95,6 +97,7 @@
 	$(NULL)
 
 CLEANFILES = 			\
+	$(BUILT_SOURCES)	\
 	$(plugin_DATA)		\
 	$(NULL)