[Xfce4-commits] r29967 - xfconf/trunk/xfconf

[Brian Tarricone]

Author: kelnos
Date: 2009-05-15 18:47:30 +0000 (Fri, 15 May 2009)
New Revision: 29967

Modified:
   xfconf/trunk/xfconf/Makefile.am
Log:
actually work around stupid dbus-binding-tool bug properly

Modified: xfconf/trunk/xfconf/Makefile.am
===================================================================
--- xfconf/trunk/xfconf/Makefile.am	2009-05-15 08:10:21 UTC (rev 29966)
+++ xfconf/trunk/xfconf/Makefile.am	2009-05-15 18:47:30 UTC (rev 29967)
@@ -51,15 +51,20 @@
 	xfconf-dbus-bindings.h
 
 xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
-	dbus-binding-tool --mode=glib-client $< > $@
-	sed -i -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\)\+;$/\1 = { 0, };/' $@
-# the above line fixes a bug in dbus-binding-tool's output
+	dbus-binding-tool --mode=glib-client $< > $(@).tmp
+	sed -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\+\).*;$$/\1 = { 0, };/' <$(@).tmp >$@
+	-rm -f $(@).tmp
+# the above fixes a bug in dbus-binding-tool's output
 # dbus-binding-tool doesn't initialise GValues to { 0, } properly
 
 if HAVE_GNUC_VISIBILITY
 TESTS = abicheck.sh
 endif
 
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	xfconf-dbus-bindings.h.tmp
+
 endif