[dconf/wip/0-25-1: 1/10] Remove libdbus-1 support



commit 1fb178fddf7adb041806078b20b00c89cb8a4cd1
Author: Allison Ryan Lortie <desrt desrt ca>
Date:   Wed Dec 16 14:54:31 2015 +0000

    Remove libdbus-1 support
    
    Stop building the dconf-dbus-1 client library.  Nobody is using it
    anymore and we will soon be taking a non-conditional dependency on
    libgio in any case.
    
    It is now only possible to use dconf with GDBus.

 Makefile.am               |    2 +-
 configure.ac              |    3 -
 dbus-1/.gitignore         |    6 -
 dbus-1/Makefile.am        |   47 ------
 dbus-1/dconf-dbus-1.c     |  188 -----------------------
 dbus-1/dconf-dbus-1.h     |   56 -------
 dbus-1/dconf-dbus-1.pc.in |   11 --
 dbus-1/dconf-libdbus-1.c  |  365 ---------------------------------------------
 dbus-1/dconf-libdbus-1.h  |   11 --
 tests/Makefile.am         |    8 -
 10 files changed, 1 insertions(+), 696 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 83cd492..dd3571a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ include Makefile.gtester
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = shm gvdb common engine service gdbus gsettings dbus-1 client bin docs tests
+SUBDIRS = shm gvdb common engine service gdbus gsettings client bin docs tests
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 EXTRA_DIST = trim-lcov.py m4
diff --git a/configure.ac b/configure.ac
index 21b57cb..95ca9d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,6 @@ GTK_DOC_CHECK([1.15])
 # Dependencies
 PKG_CHECK_MODULES(glib, glib-2.0 >= 2.44.0)
 PKG_CHECK_MODULES(gio, gio-unix-2.0)
-PKG_CHECK_MODULES(dbus, dbus-1)
 
 AC_ARG_WITH(gio_modules_dir, [  --with-gio-modules-dir=PATH choose directory for the GIO module, 
[default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
 AC_SUBST(giomodulesdir)
@@ -83,11 +82,9 @@ AC_CONFIG_FILES([
   engine/Makefile
   gdbus/Makefile
   gsettings/Makefile
-  dbus-1/dconf-dbus-1.pc
   client/dconf.pc
   client/Makefile
   service/Makefile
-  dbus-1/Makefile
   bin/Makefile
   tests/Makefile
   docs/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index adc8519..0a53ee6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,14 +64,6 @@ gdbus_filter_LDADD = \
        $(gio_LIBS)
 gdbus_filter_SOURCES = dbus.c
 
-TEST_PROGS += libdbus-1
-libdbus_1_CFLAGS = $(gio_CFLAGS) -DDBUS_BACKEND=\"/libdbus-1\"
-libdbus_1_LDADD = \
-       ../dbus-1/libdconf-libdbus-1.a          \
-       $(glib_LIBS)                            \
-       $(dbus_LIBS)
-libdbus_1_SOURCES = dbus.c
-
 TEST_PROGS += engine
 engine_CFLAGS = $(glib_CFLAGS) -DSRCDIR=\"$(abs_srcdir)\"
 engine_LDADD = \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]