[Xfce4-commits] [xfce/xfconf] 10/31: Remove gdbus-binding generated code from the repository.

[noreply at xfce.org]

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

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 9a8c7435bb4a9ca3c54576cfd1cc24f601fac6f5
Author: Ali Abdallah <aliovx at gmail.com>
Date:   Sun Apr 24 16:35:03 2016 +0200

    Remove gdbus-binding generated code from the repository.
---
 common/Makefile.am | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 10e0417..95cfbfb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -35,7 +35,7 @@ libxfconf_gvaluefuncs_la_SOURCES = \
 
 libxfconf_gvaluefuncs_la_CFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
+	$(GIO_UNIX_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
 libxfconf_gvaluefuncs_la_LDFLAGS = \
@@ -43,7 +43,7 @@ libxfconf_gvaluefuncs_la_LDFLAGS = \
 
 libxfconf_gvaluefuncs_la_LIBADD = \
 	$(GLIB_LIBS) \
-	$(DBUS_GLIB_LIBS)
+	$(GIO_UNIX_LIBS)
 
 
 libxfconf_dbus_la_SOURCES = \
@@ -55,20 +55,14 @@ libxfconf_dbus_la_CFLAGS = $(GIO_UNIX_CFLAGS)
 libxfconf_dbus_la_LIBADD = $(GIO_UNIX_LIBS)
 	
 
-if MAINTAINER_MODE
-
-
 BUILT_SOURCES = \
 	xfconf-marshal.c \
-	xfconf-marshal.h
+	xfconf-marshal.h \
 	xfconf-gdbus-bindings.c \
 	xfconf-gdbus-bindings.h
 
-xfconf-marshal.h: stamp-xfconf-marshal.h
-	@true
-stamp-xfconf-marshal.h: $(srcdir)/xfconf-marshal.list Makefile
-	$(AM_V_GEN) glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --header > xfconf-marshal.h \
-	&& echo timestamp > $(@F)
+xfconf-marshal.h: $(srcdir)/xfconf-marshal.list Makefile
+	$(AM_V_GEN) glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --header > xfconf-marshal.h
 xfconf-marshal.c: $(srcdir)/xfconf-marshal.list Makefile
 	$(AM_V_GEN) echo '#include "xfconf-marshal.h"' > xfconf-marshal.c \
 	&& glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --body >> xfconf-marshal.c
@@ -77,6 +71,7 @@ xfconf-gdbus-bindings.h:
 xfconf-gdbus-bindings.c: xfconf-dbus.xml Makefile
 	$(AM_V_GEN) $(GDBUS_CODEGEN) \
 	--interface-prefix org.xfce.Xfconf \
+	--annotate "org.xfce.Xfconf" "org.gtk.GDBus.C.Name" Exported \
 	--c-namespace Xfconf   \
 	--generate-c-code xfconf-gdbus-bindings \
 	$<
@@ -86,7 +81,8 @@ CLEANFILES = \
 	expected-abi
 
 DISTCLEANFILES = \
-	$(libxfconf_built_sources)
+	$(libxfconf_built_sources) \
+	$(BUILT_SOURCES)
 
 BUILT_SOURCES += \
 	$(libxfconf_built_sources)
@@ -97,8 +93,6 @@ xfconf-alias.h: make-exo-alias.pl $(top_srcdir)/xfconf/xfconf.symbols
 xfconf-aliasdef.c: make-exo-alias.pl $(top_srcdir)/xfconf/xfconf.symbols
 	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl -def <$(top_srcdir)/xfconf/xfconf.symbols >xfconf-aliasdef.c
 
-endif
-
 
 EXTRA_DIST = \
 	make-exo-alias.pl \

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