[gvfs] Remove final parts of libdbus

[Alexander Larsson <alexl src gnome org>]

commit 288e9153f1f6efdb1243ad4d8589519326f3ec94
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Aug 21 12:45:14 2012 +0200

    Remove final parts of libdbus
    
    Don't link to libdbus and remove libdbus utility functions.

 client/Makefile.am     |   13 +-
 common/Makefile.am     |    7 +-
 common/gvfsdbusutils.c | 1330 ------------------------------------------------
 common/gvfsdbusutils.h |   95 ----
 daemon/Makefile.am     |    6 +-
 daemon/dbus-gmain.c    |  717 --------------------------
 daemon/dbus-gmain.h    |   63 ---
 7 files changed, 9 insertions(+), 2222 deletions(-)
---
diff --git a/client/Makefile.am b/client/Makefile.am
index 66ab130..5613d58 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,11 +6,10 @@ INCLUDES = -I$(top_srcdir) \
 	-I$(top_builddir)/metadata \
 	-I$(top_srcdir)/common \
 	-I$(top_builddir)/common \
-	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"GVFS\" \
 	-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"	\
-	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
-	-DDBUS_API_SUBJECT_TO_CHANGE
+	-DGVFS_LOCALEDIR=\""$(localedir)"\"
 
 module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_vfs_.*|g_io_module_load|g_io_module_unload|g_io_module_query'
 
@@ -45,7 +44,6 @@ vfssources = \
 
 vfslibs = \
 	$(top_builddir)/common/libgvfscommon.la \
-	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -76,12 +74,11 @@ gvfsd_fuse_CFLAGS = \
 	-I$(top_srcdir) \
         -I$(top_srcdir)/common \
         -I$(top_builddir)/common \
-        $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
-        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
-        -DDBUS_API_SUBJECT_TO_CHANGE
+        $(GLIB_CFLAGS) $(FUSE_CFLAGS) \
+        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\"
 
 gvfsd_fuse_LDADD = \
 	$(top_builddir)/common/libgvfscommon.la \
-	$(GLIB_LIBS) $(DBUS_LIBS) $(FUSE_LIBS)
+	$(GLIB_LIBS) $(FUSE_LIBS)
 
 endif
diff --git a/common/Makefile.am b/common/Makefile.am
index 0c3e5a4..1346ef8 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -4,9 +4,8 @@ lib_LTLIBRARIES=libgvfscommon.la
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
 	-I$(top_srcdir)/daemon \
-	$(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
-	-DG_LOG_DOMAIN=\"GVFS\" \
-	-DDBUS_API_SUBJECT_TO_CHANGE
+	$(GLIB_CFLAGS) $(BLURAY_CFLAGS) \
+	-DG_LOG_DOMAIN=\"GVFS\"
 
 dbus_built_sources = gvfsdbus.c gvfsdbus.h
 BUILT_SOURCES = $(dbus_built_sources)
@@ -21,7 +20,6 @@ $(dbus_built_sources) : Makefile.am org.gtk.vfs.xml
 
 libgvfscommon_la_SOURCES = 	\
 	gsysutils.c gsysutils.h \
-	gvfsdbusutils.c gvfsdbusutils.h \
 	gmountspec.c gmountspec.h \
 	gmountoperationdbus.c gmountoperationdbus.h \
 	gmountsource.c gmountsource.h \
@@ -37,7 +35,6 @@ libgvfscommon_la_SOURCES = 	\
 libgvfscommon_la_LDFLAGS = -no-undefined
 
 libgvfscommon_la_LIBADD =	\
-	$(DBUS_LIBS) 		\
 	$(GLIB_LIBS)		\
 	$(BLURAY_LIBS)
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 218e3b7..1cb0cba 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -10,10 +10,9 @@ INCLUDES =					\
 	-I$(top_srcdir)/common			\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/common		\
-	$(GLIB_CFLAGS) $(DBUS_CFLAGS) 		\
+	$(GLIB_CFLAGS) 				\
 	$(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS)	\
 	$(KEYRING_CFLAGS)			\
-	-DDBUS_API_SUBJECT_TO_CHANGE		\
 	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE	\
 	-DLIBEXEC_DIR=\"$(libexecdir)/\" 	\
 	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
@@ -24,7 +23,7 @@ noinst_LTLIBRARIES=libdaemon.la
 libraries =						\
 	libdaemon.la					\
 	$(top_builddir)/common/libgvfscommon.la		\
-	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+	$(GLIB_LIBS) $(KEYRING_LIBS)
 
 gvfs_gschemas =
 gvfs_gschemas_convert =
@@ -184,7 +183,6 @@ libdaemon_la_SOURCES = \
 	gvfsjobsetattribute.c gvfsjobsetattribute.h \
 	gvfsjobqueryattributes.c gvfsjobqueryattributes.h \
 	gvfsjobcreatemonitor.c gvfsjobcreatemonitor.h \
-	dbus-gmain.h dbus-gmain.c \
 	gvfskeyring.h gvfskeyring.c \
         $(NULL)