GNOME.org
 

[tracker] Append API version suffix to pkglibdir

commit ccffdba7d071c262b42b8c9c3475793e1b5be906
Author: Jürg Billeter <j bitron ch>
Date:   Tue Mar 24 17:39:18 2009 +0100

    Append API version suffix to pkglibdir
---
 data/tracker-module-1.0.pc.in           |    2 +-
 filters/application/Makefile.am         |    2 +-
 filters/text/Makefile.am                |    2 +-
 src/libstemmer/Makefile.am              |    2 +-
 src/libtracker-common/Makefile.am       |    2 +-
 src/libtracker-data/Makefile.am         |    2 +-
 src/libtracker-db/Makefile.am           |    2 +-
 src/plugins/evolution/Makefile.am       |    4 ++--
 src/plugins/kmail/Makefile.am           |    4 ++--
 src/plugins/rss/Makefile.am             |    4 ++--
 src/tracker-extract/Makefile.am         |    2 +-
 src/tracker-indexer/Makefile.am         |    6 +++---
 src/tracker-indexer/modules/Makefile.am |    2 +-
 src/trackerd/Makefile.am                |    4 ++--
 tests/tracker-indexer/Makefile.am       |    4 ++--
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/tracker-module-1.0.pc.in b/data/tracker-module-1.0.pc.in
index a145b1e..0291fea 100644
--- a/data/tracker-module-1.0.pc.in
+++ b/data/tracker-module-1.0.pc.in
@@ -7,5 +7,5 @@ Name: tracker-indexer-module
 Description: A library to develop tracker indexer modules
 Version: @VERSION@
 Requires: glib-2.0 pango
-Libs: -L${libdir}/tracker -ltracker-module
+Libs: -L${libdir}/tracker- TRACKER_API_VERSION@ -ltracker-module
 Cflags: -I${includedir}/tracker-1.0
diff --git a/filters/application/Makefile.am b/filters/application/Makefile.am
index c18ca35..869348c 100644
--- a/filters/application/Makefile.am
+++ b/filters/application/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-thumbappbindir = $(libdir)/tracker/filters/application
+thumbappbindir = $(libdir)/tracker-$(TRACKER_API_VERSION)/filters/application
 
 thumbappbin_SCRIPTS = 						\
 	pdf_filter 						\
diff --git a/filters/text/Makefile.am b/filters/text/Makefile.am
index c5d936e..2bd1645 100644
--- a/filters/text/Makefile.am
+++ b/filters/text/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-filterbindir = $(libdir)/tracker/filters/text
+filterbindir = $(libdir)/tracker-$(TRACKER_API_VERSION)/filters/text
 
 filterbin_SCRIPTS = 			\
 	html_filter 			\
diff --git a/src/libstemmer/Makefile.am b/src/libstemmer/Makefile.am
index ecd9bd9..1e7087e 100644
--- a/src/libstemmer/Makefile.am
+++ b/src/libstemmer/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =				\
 	-I$(top_srcdir)/src		\
 	$(WARN_CFLAGS)
 
-libstemmerdir = $(libdir)/tracker
+libstemmerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libstemmer_LTLIBRARIES = libstemmer.la
 
 libstemmer_la_SOURCES = 		\
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index a2b0013..5f01a9c 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES =						\
 	$(DBUS_CFLAGS)					\
 	$(UNAC_CFLAGS)
 
-libtracker_commondir = $(libdir)/tracker
+libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_commonincludedir=$(includedir)/tracker-1.0/libtracker-common/
 libtracker_common_LTLIBRARIES = libtracker-common.la
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 125c878..8dbc06f 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES =								\
 	$(RAPTOR_CFLAGS)						\
 	$(GCOV_CFLAGS)
 
-libtracker_datadir = $(libdir)/tracker
+libtracker_datadir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_data_LTLIBRARIES = libtracker-data.la
 
 libtracker_data_la_SOURCES = 						\
diff --git a/src/libtracker-db/Makefile.am b/src/libtracker-db/Makefile.am
index 05080c6..a6203bb 100644
--- a/src/libtracker-db/Makefile.am
+++ b/src/libtracker-db/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES =								\
 	$(SQLITE3_CFLAGS)						\
 	$(QDBM_CFLAGS)
 
-libtracker_dbdir = $(libdir)/tracker
+libtracker_dbdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_db_LTLIBRARIES = libtracker-db.la
 
 libtracker_db_la_SOURCES = 						\
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index b5e6e67..dbc9209 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -28,8 +28,8 @@ eplugin_LTLIBRARIES = liborg-freedesktop-Tracker-evolution-plugin.la
 
 module_flags = -module -avoid-version -no-undefined
 
-pushd_modulesdir = $(libdir)/tracker/push-modules/daemon
-pushi_modulesdir = $(libdir)/tracker/push-modules/indexer
+pushd_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon
+pushi_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/indexer
 
 pushd_modules_LTLIBRARIES = libtracker-module-evolution-daemon-module.la
 pushi_modules_LTLIBRARIES = libtracker-module-evolution-indexer-module.la
diff --git a/src/plugins/kmail/Makefile.am b/src/plugins/kmail/Makefile.am
index bcb7ea7..5a3e5e9 100644
--- a/src/plugins/kmail/Makefile.am
+++ b/src/plugins/kmail/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES = -I$(top_srcdir)/src						\
 
 module_flags = -module -avoid-version -no-undefined
 
-pushd_modulesdir = $(libdir)/tracker/push-modules/daemon
-pushi_modulesdir = $(libdir)/tracker/push-modules/indexer
+pushd_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon
+pushi_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/indexer
 
 pushd_modules_LTLIBRARIES = libtracker-module_kmail-daemon-module.la
 pushi_modules_LTLIBRARIES = libtracker-module_kmail-indexer-module.la
diff --git a/src/plugins/rss/Makefile.am b/src/plugins/rss/Makefile.am
index a1f72af..712040d 100644
--- a/src/plugins/rss/Makefile.am
+++ b/src/plugins/rss/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES = -I$(top_srcdir)/src						\
 
 module_flags = -module -avoid-version -no-undefined
 
-pushd_modulesdir = $(libdir)/tracker/push-modules/daemon
-pushi_modulesdir = $(libdir)/tracker/push-modules/indexer
+pushd_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon
+pushi_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/indexer
 
 pushd_modules_LTLIBRARIES = libtracker-module-rss-daemon-module.la
 pushi_modules_LTLIBRARIES = libtracker-module-rss-indexer-module.la
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 0a660cb..e3709bb 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 module_flags = -module -avoid-version -no-undefined
-modulesdir = $(libdir)/tracker/extract-modules
+modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
 INCLUDES = 								\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index b54fad1..b952079 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -7,8 +7,8 @@ INCLUDES =								\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DPKGLIBDIR=\""$(libdir)/tracker"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
-	-DPUSH_MODULES_DIR=\""$(libdir)/tracker/push-modules/indexer"\" \
+	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/indexer-modules"\"	\
+	-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/indexer"\" \
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
@@ -20,7 +20,7 @@ INCLUDES =								\
 	$(GCOV_CFLAGS)							\
 	$(RAPTOR_CFLAGS)
 
-libtracker_moduledir = $(libdir)/tracker
+libtracker_moduledir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_moduleincludedir=$(includedir)/tracker-1.0/libtracker-module/
 libtracker_module_LTLIBRARIES = libtracker-module.la
 
diff --git a/src/tracker-indexer/modules/Makefile.am b/src/tracker-indexer/modules/Makefile.am
index 7b17eda..46ce756 100644
--- a/src/tracker-indexer/modules/Makefile.am
+++ b/src/tracker-indexer/modules/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 module_flags = -module -avoid-version -no-undefined
-indexer_modulesdir = $(libdir)/tracker/indexer-modules
+indexer_modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/indexer-modules
 
 INCLUDES =								\
 	-DSHAREDIR=\""$(datadir)"\"					\
diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am
index 01e8ab0..2bdb41a 100644
--- a/src/trackerd/Makefile.am
+++ b/src/trackerd/Makefile.am
@@ -3,8 +3,8 @@ include $(top_srcdir)/Makefile.decl
 INCLUDES =								\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker/mail-modules\"         \
-	-DPUSH_MODULES_DIR=\""$(libdir)/tracker/push-modules/daemon"\"	\
+	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\"         \
+	-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\"	\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am
index 7c035ba..1462ef6 100644
--- a/tests/tracker-indexer/Makefile.am
+++ b/tests/tracker-indexer/Makefile.am
@@ -7,8 +7,8 @@ TEST_PROGS += tracker-metadata-utils
 INCLUDES = 									\
 	-DTEST									\
 	-DG_LOG_DOMAIN=\"Tracker\"						\
-	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"		\
-	-DPKGLIBDIR=\""$(libdir)/tracker"\"					\
+	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/indexer-modules"\"	\
+	-DPKGLIBDIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)"\"		\
 	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
 	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]