[Xfce4-commits] [xfce/xfce4-power-manager] 33/63: Replaced dbus-binding-tool with gdbus-codegen

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 08b4182abda32902e67de91e1ac7d5bf78c3c600
Author: Peter de Ridder <peter at xfce.org>
Date:   Mon Mar 9 23:43:43 2015 +0100

    Replaced dbus-binding-tool with gdbus-codegen
---
 libdbus/Makefile.am  |    7 ++++---
 settings/Makefile.am |    9 +++++----
 src/Makefile.am      |   21 ++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/libdbus/Makefile.am b/libdbus/Makefile.am
index cada510..a7e1e98 100644
--- a/libdbus/Makefile.am
+++ b/libdbus/Makefile.am
@@ -27,6 +27,7 @@ if MAINTAINER_MODE
 BUILT_SOURCES =				\
 	xfpm-dbus-marshal.c		\
 	xfpm-dbus-marshal.h		\
+	org.xfce.unique.c		\
 	org.xfce.unique.h
 
 xfpm-dbus-marshal.c: xfpm-dbus-marshal.list
@@ -36,8 +37,8 @@ xfpm-dbus-marshal.c: xfpm-dbus-marshal.list
 xfpm-dbus-marshal.h: xfpm-dbus-marshal.list
 	glib-genmarshal $< --prefix=_xfpm_dbus_marshal --header > $@
 
-org.xfce.unique.h: org.xfce.unique.xml
-	dbus-binding-tool --mode=glib-server --prefix=xfce_unique $< >$@
+org.xfce.unique.c org.xfce.unique.h: org.xfce.unique.xml
+	gdbus-codegen --interface-prefix=org.xfce. --c-namespace=Xfpm --generate-c-code=org.xfce.unique $<
 
 endif
 
@@ -45,4 +46,4 @@ EXTRA_DIST =				\
 	xfpm-dbus-marshal.list
 
 DISTCLEANFILES =			\
-	$(BUILT_SOURCES)
\ No newline at end of file
+	$(BUILT_SOURCES)
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 2474031..8116b07 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -51,11 +51,12 @@ manpage_DATA = xfce4-power-manager-settings.1
 
 if MAINTAINER_MODE
 
-BUILT_SOURCES = 				\
-	xfce-power-manager-dbus-client.h
+BUILT_SOURCES = 			\
+	xfce-power-manager-dbus.c	\
+	xfce-power-manager-dbus.h
 
-xfce-power-manager-dbus-client.h: $(top_srcdir)/src/org.xfce.Power.Manager.xml
-	dbus-binding-tool --mode=glib-client --prefix=xfpm_manager $< >$@
+xfce-power-manager-dbus.c xfce-power-manager-dbus.h: $(top_srcdir)/src/org.xfce.Power.Manager.xml
+	gdbus-codegen --interface-prefix=org.xfce. --c-namespace=Xfpm --generate-c-code=xfce-power-manager-dbus $<
 
 endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 72a1f7e..59fd59d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,11 +131,13 @@ manpagedir = $(mandir)/man1
 manpage_DATA = xfce4-power-manager.1
 
 BUILT_SOURCES =					\
-	xfce-power-manager-dbus-server.h	\
-	xfce-power-manager-dbus-client.h	\
+	xfce-power-manager-dbus.c		\
+	xfce-power-manager-dbus.h		\
 	xfpm-marshal.c                          \
         xfpm-marshal.h				\
+	org.freedesktop.PowerManagement.c       \
 	org.freedesktop.PowerManagement.h       \
+	org.freedesktop.PowerManagement.Inhibit.c \
 	org.freedesktop.PowerManagement.Inhibit.h
 
 if MAINTAINER_MODE
@@ -147,17 +149,14 @@ xfpm-marshal.c: xfpm-marshal.list
 xfpm-marshal.h: xfpm-marshal.list
 	glib-genmarshal $< --prefix=_xfpm_marshal --header > $@
 
-xfce-power-manager-dbus-server.h: $(srcdir)/org.xfce.Power.Manager.xml
-	dbus-binding-tool --mode=glib-server --prefix=xfpm_manager $< >$@
+xfce-power-manager-dbus.c xfce-power-manager-dbus.h: $(srcdir)/org.xfce.Power.Manager.xml
+	gdbus-codegen --interface-prefix=org.xfce. --c-namespace=Xfpm --generate-c-code=xfce-power-manager-dbus $<
 
-xfce-power-manager-dbus-client.h: $(srcdir)/org.xfce.Power.Manager.xml
-	dbus-binding-tool --mode=glib-client --prefix=xfpm_manager $< >$@
+org.freedesktop.PowerManagement.c org.freedesktop.PowerManagement.h: $(srcdir)/org.freedesktop.PowerManagement.xml
+	gdbus-codegen --interface-prefix=org.freedesktop. --c-namespace=Xfpm --generate-c-code=org.freedesktop.PowerManagement $<
 
-org.freedesktop.PowerManagement.h: $(srcdir)/org.freedesktop.PowerManagement.xml
-	dbus-binding-tool --mode=glib-server --prefix=xfpm_power $< >$@
-
-org.freedesktop.PowerManagement.Inhibit.h: $(srcdir)/org.freedesktop.PowerManagement.Inhibit.xml
-	dbus-binding-tool --mode=glib-server --prefix=xfpm_inhibit $< >$@
+org.freedesktop.PowerManagement.Inhibit.c org.freedesktop.PowerManagement.Inhibit.h: $(srcdir)/org.freedesktop.PowerManagement.Inhibit.xml
+	gdbus-codegen --interface-prefix=org.freedesktop. --c-namespace=Xfpm --generate-c-code=org.freedesktop.PowerManagement.Inhibit $<
 
 endif
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.