diff options
| author | Ali Abdallah <aliovx@gmail.com> | 2016-04-21 14:20:51 +0200 |
|---|---|---|
| committer | Ali Abdallah <aliovx@gmail.com> | 2016-04-21 14:20:51 +0200 |
| commit | 1bbde5a1f2b73e3b3637568fc1d5dba405e92d5f (patch) | |
| tree | 9f8ae3d89e685d5e5ae582dfed9cee77ed648db3 /xfconf | |
| parent | 6312fb9aabffefddfd4815c8fc3c98b2dbfbb398 (diff) | |
| download | xfconf-1bbde5a1f2b73e3b3637568fc1d5dba405e92d5f.tar.gz | |
Move the gdbus generated code to the common directory
Diffstat (limited to 'xfconf')
| -rw-r--r-- | xfconf/Makefile.am | 22 | ||||
| -rw-r--r-- | xfconf/xfconf-cache.c | 2 | ||||
| -rw-r--r-- | xfconf/xfconf-channel.c | 2 |
3 files changed, 3 insertions, 23 deletions
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am index 4fb624e..7cf962d 100644 --- a/xfconf/Makefile.am +++ b/xfconf/Makefile.am @@ -21,8 +21,6 @@ libxfconf_0_la_SOURCES = \ xfconf-cache.c \ xfconf-cache.h \ xfconf-channel.c \ - xfconf-dbus-bindings.h \ - xfconf-gdbus-bindings.c \ xfconf-private.h \ xfconf.c \ $(top_srcdir)/common/xfconf-types.c @@ -44,6 +42,7 @@ libxfconf_0_la_LDFLAGS = \ libxfconf_0_la_LIBADD = \ $(top_builddir)/common/libxfconf-common.la \ $(top_builddir)/common/libxfconf-gvaluefuncs.la \ + $(top_builddir)/common/libxfconf-dbus.la \ $(GIO_LIBS) \ $(GIO_UNIX_LIBS) \ $(GLIB_LIBS) \ @@ -53,25 +52,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfconf-0.pc -if MAINTAINER_MODE - -BUILT_SOURCES = \ - xfconf-gdbus-bindings.c \ - xfconf-gdbus-bindings.h - -xfconf-gdbus-bindings.h: -xfconf-gdbus-bindings.c: $(top_srcdir)/common/xfconf-dbus.xml Makefile - $(AM_V_GEN) $(GDBUS_CODEGEN) \ - --interface-prefix org.xfce.Xfconf \ - --c-namespace Xfconf \ - --generate-c-code xfconf-gdbus-bindings \ - $< - -CLEANFILES = \ - $(BUILT_SOURCES) - -endif - EXTRA_DIST = \ abicheck.sh \ xfconf.symbols diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c index 3022b34..c8249c0 100644 --- a/xfconf/xfconf-cache.c +++ b/xfconf/xfconf-cache.c @@ -30,7 +30,7 @@ #include "xfconf-cache.h" #include "xfconf-channel.h" #include "xfconf-errors.h" -#include "xfconf-gdbus-bindings.h" +#include "common/xfconf-gdbus-bindings.h" #include "common/xfconf-gvaluefuncs.h" #include "xfconf-private.h" #include "common/xfconf-marshal.h" diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c index c861b75..e6a4fc8 100644 --- a/xfconf/xfconf-channel.c +++ b/xfconf/xfconf-channel.c @@ -29,7 +29,7 @@ #include "xfconf-channel.h" #include "xfconf-cache.h" -#include "xfconf-gdbus-bindings.h" +#include "common/xfconf-gdbus-bindings.h" #include "common/xfconf-gvaluefuncs.h" #include "xfconf-private.h" #include "common/xfconf-marshal.h" |