[epiphany/gdbus: 6/6] build: use gdbus-codegen

[Diego Escalante Urrelo <diegoe src gnome org>]

commit 40e11568702acc018433fdad92ea93245bcdda14
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Sat May 7 16:17:12 2011 -0500

    build: use gdbus-codegen

 configure.ac    |   13 ++++++-------
 src/Makefile.am |   27 ++++++++++-----------------
 2 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c21112e..1c56068 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ if test "$enable_maintainer_mode" = "yes"; then
 	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 fi
 
-GLIB_REQUIRED=2.25.13
+GLIB_REQUIRED=2.29.5
 GTK_REQUIRED=3.0.2
 LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
@@ -125,18 +125,17 @@ PKG_CHECK_MODULES([DEPENDENCIES], [
 		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
                   gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+		  dbus-glib-1 >= $DBUS_GLIB_REQUIRED
 		  ])
 
 # ****
-# DBUS
+# GDBUS
 # ****
 
-PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
+AC_PATH_PROG([GDBUS_BINDING_TOOL],[gdbus-codegen],[no])
 
-AC_PATH_PROG([DBUS_BINDING_TOOL],[dbus-binding-tool],[no])
-
-if test "$DBUS_BINDING_TOOL" = "no"; then
-	AC_MSG_ERROR([dbus-binding-tool not found])
+if test "$GDBUS_BINDING_TOOL" = "no"; then
+	AC_MSG_ERROR([gdbus-codegen not found])
 fi
 
 # ******************
diff --git a/src/Makefile.am b/src/Makefile.am
index f399505..320ac62 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,8 @@ libephymain_la_SOURCES = \
 	ephy-extensions-manager.c		\
 	ephy-find-toolbar.c			\
 	ephy-fullscreen-popup.c			\
+	ephy-gdbus-bindings.c			\
+	ephy-gdbus-bindings.h			\
 	ephy-go-action.c			\
 	ephy-home-action.c			\
 	ephy-history-window.c			\
@@ -186,8 +188,8 @@ endif
 
 BUILT_SOURCES =	\
 	$(TYPES_SOURCE)			\
-	ephy-dbus-client-bindings.h	\
-	ephy-dbus-server-bindings.h
+	ephy-gdbus-bindings.c		\
+	ephy-gdbus-bindings.h
 
 
 TYPES_SOURCE = \
@@ -197,8 +199,8 @@ TYPES_SOURCE = \
 stamp_files = \
 	stamp-ephy-type-builtins.c	\
 	stamp-ephy-type-builtins.h	\
-	stamp-ephy-dbus-server-bindings.h	\
-	stamp-ephy-dbus-client-bindings.h
+	stamp-ephy-gdbus-bindings.c	\
+	stamp-ephy-gdbus-bindings.h
 
 ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile
 	@true
@@ -242,20 +244,11 @@ stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
 	&& rm -f xgen-$(@F) \
 	&& echo timestamp > $(@F)
 
-ephy-dbus-server-bindings.h: stamp-ephy-dbus-server-bindings.h
+ephy-gdbus-bindings.c:
+ephy-gdbus-bindings.h: stamp-ephy-gdbus-bindings
 	@true
-stamp-ephy-dbus-server-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
-	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > xgen-$(@F) \
-	&& ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
-	&& rm -f xgen-$(@F) \
-	&& echo timestamp > $(@F)
-
-ephy-dbus-client-bindings.h: stamp-ephy-dbus-client-bindings.h
-	@true
-stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
-	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > xgen-$(@F) \
-	&& ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
-	&& rm -f xgen-$(@F) \
+stamp-ephy-gdbus-bindings: $(top_srcdir)/data/epiphany-service.xml Makefile
+	$(AM_V_GEN) $(GDBUS_BINDING_TOOL) --generate-c-code ephy-gdbus-bindings $(top_srcdir)/data/epiphany-service.xml \
 	&& echo timestamp > $(@F)
 
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)