[tracker] libtracker-miner: Change name to include version
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-miner: Change name to include version
- Date: Tue, 19 Jan 2010 16:02:30 +0000 (UTC)
commit 1ff65551c75d799732d065f5b07e0fd80a9f78b7
Author: Martyn Russell <martyn lanedo com>
Date: Tue Jan 19 16:02:19 2010 +0000
libtracker-miner: Change name to include version
So the .so is now called libtracker-miner-0.7 and is in /usr/lib not
in /usr/lib/tracker-0.7. This is because this library is not an
internal library but a library that needs to be available to others
writing data miners for Tracker
data/tracker-miner.pc.in | 2 +-
docs/reference/libtracker-miner/Makefile.am | 2 +-
examples/libtracker-miner/Makefile.am | 2 +-
src/libtracker-miner/Makefile.am | 9 +++++----
src/plugins/evolution/Makefile.am | 2 +-
src/tracker-control/Makefile.am | 6 +++---
src/tracker-miner-fs/Makefile.am | 4 ++--
src/tracker-status-icon/Makefile.am | 2 +-
src/tracker-utils/Makefile.am | 4 ++--
src/tracker-writeback/Makefile.am | 2 +-
10 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/data/tracker-miner.pc.in b/data/tracker-miner.pc.in
index 5c54998..42cea30 100644
--- a/data/tracker-miner.pc.in
+++ b/data/tracker-miner.pc.in
@@ -7,5 +7,5 @@ Name: tracker-miner
Description: A library to develop tracker data miners
Version: @VERSION@
Requires: glib-2.0 pango dbus-glib-1
-Libs: -L${libdir}/tracker- TRACKER_API_VERSION@ -ltracker-miner
+Libs: -L${libdir} -ltracker-miner- TRACKER_API_VERSION@
Cflags: -I${includedir}/tracker- TRACKER_API_VERSION@
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index ccd1ef5..fbd21fb 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -43,7 +43,7 @@ INCLUDES = \
$(UNAC_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(HAL_LIBS) \
$(DBUS_LIBS) \
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 9a4bf96..d1e7da0 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -25,8 +25,8 @@ tracker_miner_test_SOURCES = \
tracker-main.c
tracker_miner_test_LDADD = \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(DBUS_LIBS) \
$(GMODULE_LIBS) \
$(GTHREAD_LIBS) \
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 7f7a1bc..ab17b4b 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -19,11 +19,12 @@ INCLUDES = \
$(DBUS_CFLAGS) \
$(UNAC_CFLAGS)
+lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
+
libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
-libtracker_miner_LTLIBRARIES = libtracker-miner.la
-libtracker_miner_la_SOURCES = \
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES = \
tracker-crawler.c \
tracker-crawler.h \
tracker-marshal.c \
@@ -45,10 +46,10 @@ libtracker_minerinclude_HEADERS = \
tracker-miner-dbus.h \
tracker-miner-fs.h
-libtracker_miner_la_LDFLAGS = \
+libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libtracker_miner_la_LIBADD = \
+libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \
$(top_builddir)/src/libstemmer/libstemmer.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 3e2b168..b143c2e 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -38,8 +38,8 @@ liborg_freedesktop_Tracker_evolution_plugin_la_SOURCES = \
liborg_freedesktop_Tracker_evolution_plugin_la_LDFLAGS = -module -avoid-version
liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(EVOLUTION_PLUGIN_LIBS) \
$(DBUS_LIBS) \
$(GCOV_LIBS)
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index de3c97f..84f0ba3 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -13,10 +13,10 @@ INCLUDES = \
$(GLIB2_CFLAGS)
libs = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-db/libtracker-db.la \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-db/libtracker-db.la \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GTHREAD_LIBS) \
diff --git a/src/tracker-miner-fs/Makefile.am b/src/tracker-miner-fs/Makefile.am
index d97185a..9cffda7 100644
--- a/src/tracker-miner-fs/Makefile.am
+++ b/src/tracker-miner-fs/Makefile.am
@@ -29,13 +29,13 @@ tracker_miner_fs_SOURCES = \
tracker-thumbnailer.h
tracker_miner_fs_LDADD = \
+ $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-data/libtracker-data.la \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libstemmer/libstemmer.la \
$(top_builddir)/src/libinotify/libinotify.la \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(tracker_store_win_libs) \
$(DBUS_LIBS) \
$(GMODULE_LIBS) \
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index 311fa64..97b4c87 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -15,7 +15,7 @@ bin_PROGRAMS = tracker-status-icon
# Note: the -lX11 is needed for XGetModifierMapping() and other X11 calls
tracker_status_icon_LDADD = \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(TRACKER_APPS_LIBS) \
$(GCOV_LIBS) \
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 2ccaf1e..1733e12 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -13,10 +13,10 @@ INCLUDES = \
$(GLIB2_CFLAGS)
libs = \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
+ $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(GTHREAD_LIBS) \
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 0d67a81..5c02c8c 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -70,8 +70,8 @@ tracker_writeback_SOURCES = \
tracker-main.c
tracker_writeback_LDADD = \
- $(top_builddir)/src/libtracker-miner/libtracker-miner.la \
$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+ $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(TRACKER_APPS_LIBS) \
$(DBUS_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]