[tracker/gdbus-porting] tracker-control: Removed dbus-glib dependency



commit 3ae1bad15effc2905cfcb1cab3ab570574fc6a53
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jan 7 15:53:24 2011 +0000

    tracker-control: Removed dbus-glib dependency
    
    Removed unused dbus-binding-tool client generation.

 configure.ac                          |    2 --
 src/tracker-control/Makefile.am       |   12 ------------
 src/tracker-control/tracker-control.c |    4 ++--
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2a1097e..78b3270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,8 +285,6 @@ PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$LIBTRACKER_SPARQL_REQUIRED])
 TRACKER_CONTROL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                           gio-unix-2.0 >= $GLIB_REQUIRED
                           gthread-2.0  >= $GLIB_REQUIRED
-                          dbus-1       >= $DBUS_REQUIRED
-                          dbus-glib-1  >= $DBUS_GLIB_REQUIRED
                           uuid"
 
 PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED])
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index be65013..80d97d2 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =                                          \
 bin_PROGRAMS = tracker-control
 
 tracker_control_SOURCES =                              \
-	$(dbus_sources)                                \
 	tracker-control.c
 
 tracker_control_LDADD =                                \
@@ -20,14 +19,3 @@ tracker_control_LDADD =                                \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_CONTROL_LIBS)
-
-dbus_sources =                                         \
-	tracker-miner-files-index-client.h
-
-%-client.h: $(top_srcdir)/data/dbus/%.xml
-	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
-
-BUILT_SOURCES =                                        \
-	$(dbus_sources)
-
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c
index 51027d3..c3714bc 100644
--- a/src/tracker-control/tracker-control.c
+++ b/src/tracker-control/tracker-control.c
@@ -33,12 +33,12 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-common.h>
+
 #include <libtracker-data/tracker-db-config.h>
 #include <libtracker-data/tracker-db-journal.h>
 #include <libtracker-data/tracker-db-manager.h>
-#include <libtracker-miner/tracker-miner.h>
 
-#include "tracker-miner-files-index-client.h"
+#include <libtracker-miner/tracker-miner.h>
 
 #define ABOUT	  \
 	"Tracker " PACKAGE_VERSION "\n"



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