libtracker-sparql: Use static linking instead of plugins

Plugin loading in threads may be problematic in certain environments.
As we do not currently support external plugins anyway, this changes
libtracker-bus and libtracker-direct to be part of libtracker-sparql.
This will also slightly improve initialization performance.

Fixes NB#241659.

2 files changed, 1 insertions, 12 deletions

diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index 05af4f81b..704d95667 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
-
-modules_LTLIBRARIES = libtracker-bus.la
+noinst_LTLIBRARIES = libtracker-bus.la
 
 AM_VALAFLAGS =                                         \
 	--includedir=libtracker-bus                    \
@@ -26,14 +24,10 @@ libtracker_bus_la_SOURCES =                            \
 	tracker-bus-fd-cursor.vala
 
 libtracker_bus_la_LIBADD =                             \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_BUS_LIBS)
 
-libtracker_bus_la_LDFLAGS =                            \
-	-module -avoid-version -no-undefined
-
 noinst_HEADERS =                                       \
 	tracker-bus.h
 
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index c46fe2d3c..03ae3f3ca 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -349,8 +349,3 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		                                    types);
 	}
 }
-
-public Tracker.Sparql.Connection? module_init () throws GLib.Error {
-	Tracker.Sparql.Connection plugin = new Tracker.Bus.Connection ();
-	return plugin;
-}