diff options
| author | Jürg Billeter <j@bitron.ch> | 2011-04-01 15:35:10 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2011-04-04 12:12:35 +0200 |
| commit | 0ec9878654c9b233de2193043870dd9f2e1fab9e (patch) | |
| tree | 679dfac82552790f584e19fc994ff206d49b872e /src/libtracker-sparql/Makefile.am | |
| parent | 8c9074f17d235301ff5767d09b87323e091fffa0 (diff) | |
| download | tracker-0ec9878654c9b233de2193043870dd9f2e1fab9e.tar.gz | |
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.
Diffstat (limited to 'src/libtracker-sparql/Makefile.am')
| -rw-r--r-- | src/libtracker-sparql/Makefile.am | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am index 38f951201..e863868b0 100644 --- a/src/libtracker-sparql/Makefile.am +++ b/src/libtracker-sparql/Makefile.am @@ -1,8 +1,6 @@ include $(top_srcdir)/Makefile.decl -modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules - -lib_LTLIBRARIES = libtracker-sparql-@TRACKER_API_VERSION@.la +noinst_LTLIBRARIES = libtracker-sparql.la AM_VALAFLAGS = \ --includedir=libtracker-sparql \ @@ -10,35 +8,28 @@ AM_VALAFLAGS = \ --vapi tracker-sparql-$(TRACKER_API_VERSION).vapi \ --pkg gio-2.0 --pkg gmodule-2.0 --pkg posix \ $(BUILD_VALAFLAGS) \ - config.vapi \ $(top_srcdir)/src/vapi/glib-2.0-fixes.vapi AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ - -DSPARQL_MODULES_DIR=\""$(modulesdir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(LIBTRACKER_SPARQL_CFLAGS) libtracker_sparqlincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-sparql -libtracker_sparql_@TRACKER_API_VERSION@_la_SOURCES = \ +libtracker_sparql_la_SOURCES = \ tracker-builder.vala \ tracker-connection.vala \ tracker-cursor.vala \ - tracker-backend.vala \ tracker-utils.vala \ tracker-uri.c \ tracker-init.c -libtracker_sparql_@TRACKER_API_VERSION@_la_LIBADD = \ +libtracker_sparql_la_LIBADD = \ $(BUILD_LIBS) \ $(LIBTRACKER_SPARQL_LIBS) -libtracker_sparql_@TRACKER_API_VERSION@_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - -export-symbols-regex '^tracker_sparql_(connection|cursor|builder|escape|error|value|get)_.*' - libtracker_sparqlinclude_HEADERS = \ tracker-sparql.h @@ -52,7 +43,7 @@ vapi_DATA = \ tracker-sparql-$(TRACKER_API_VERSION).deps BUILT_SOURCES = \ - libtracker_sparql_$(TRACKER_API_VERSION)_la_vala.stamp + libtracker_sparql_la_vala.stamp MAINTAINERCLEANFILES = \ tracker-sparql-$(TRACKER_API_VERSION).vapi \ @@ -60,7 +51,6 @@ MAINTAINERCLEANFILES = \ tracker-sparql.h EXTRA_DIST = \ - config.vapi \ tracker-sparql-$(TRACKER_API_VERSION).vapi \ tracker-sparql-$(TRACKER_API_VERSION).deps \ tracker-sparql.deps |