[tracker/libraries: 3/3] Use convenience libraries for libtracker-data dependencies



commit 8c3a625b96036646e7429ddb07f43dac5f1ea627
Author: Jürg Billeter <j bitron ch>
Date:   Fri Aug 21 18:01:45 2009 +0200

    Use convenience libraries for libtracker-data dependencies
    
    There is no need to build and install separate .so files for
    libstemmer, libtracker-fts, and libtracker-db, convert them to
    convenience libraries.

 src/libstemmer/Makefile.am    |    5 +----
 src/libtracker-db/Makefile.am |    6 +-----
 src/tracker-fts/Makefile.am   |    6 +-----
 3 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/libstemmer/Makefile.am b/src/libstemmer/Makefile.am
index 1e7087e..45fee9b 100644
--- a/src/libstemmer/Makefile.am
+++ b/src/libstemmer/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES =				\
 	-I$(top_srcdir)/src		\
 	$(WARN_CFLAGS)
 
-libstemmerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libstemmer_LTLIBRARIES = libstemmer.la
+noinst_LTLIBRARIES = libstemmer.la
 
 libstemmer_la_SOURCES = 		\
 	libstemmer.c 			\
@@ -50,6 +49,4 @@ noinst_HEADERS =			\
 
 
 libstemmer_la_LIBADD = $(GCOV_LIBS)
-libstemmer_la_LDFLAGS = 		\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/src/libtracker-db/Makefile.am b/src/libtracker-db/Makefile.am
index 6569ad0..951359b 100644
--- a/src/libtracker-db/Makefile.am
+++ b/src/libtracker-db/Makefile.am
@@ -12,8 +12,7 @@ INCLUDES =								\
 	$(DBUS_CFLAGS)							\
 	$(SQLITE3_CFLAGS)
 
-libtracker_dbdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-libtracker_db_LTLIBRARIES = libtracker-db.la
+noinst_LTLIBRARIES = libtracker-db.la
 
 libtracker_db_la_SOURCES = 						\
 	tracker-db-dbus.c						\
@@ -27,9 +26,6 @@ noinst_HEADERS =							\
 	tracker-db-interface-sqlite.h					\
 	tracker-db-manager.h 
 
-libtracker_db_la_LDFLAGS =						\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
 libtracker_db_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/tracker-fts/libtracker-fts.la		\
diff --git a/src/tracker-fts/Makefile.am b/src/tracker-fts/Makefile.am
index 21b3d13..dd4362c 100644
--- a/src/tracker-fts/Makefile.am
+++ b/src/tracker-fts/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES =							\
 	$(PANGO_CFLAGS)						\
 	$(SQLITE3_CFLAGS)
 
-tracker_fts_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-tracker_fts_modules_LTLIBRARIES = libtracker-fts.la
+noinst_LTLIBRARIES = libtracker-fts.la
 
 libtracker_fts_la_SOURCES = 					\
 	tracker-fts.c						\
@@ -21,9 +20,6 @@ libtracker_fts_la_SOURCES = 					\
 	tracker-fts-hash.c					\
 	tracker-fts-hash.h
 
-libtracker_fts_la_LDFLAGS =					\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
 libtracker_fts_la_LIBADD =						\
 	$(SQLITE3_LIBS)						\
 	$(GTHREAD_LIBS)						\



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