tracker r3106 - in trunk: . src/libinotify src/libstemmer src/libtracker src/libtracker-common src/libtracker-data src/libtracker-db src/libtracker-gtk

[mr svn gnome org]

Author: mr
Date: Thu Mar 19 12:16:25 2009
New Revision: 3106
URL: http://svn.gnome.org/viewvc/tracker?rev=3106&view=rev

Log:
	* configure.ac:
	* src/libinotify/Makefile.am:
	* src/libstemmer/Makefile.am:
	* src/libtracker-common/Makefile.am:
	* src/libtracker-data/Makefile.am:
	* src/libtracker-db/Makefile.am:
	* src/libtracker-gtk/Makefile.am:
	* src/libtracker/Makefile.am: Added libtool library versioning so
	libraries are not all named .so.0.0.0.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/libinotify/Makefile.am
   trunk/src/libstemmer/Makefile.am
   trunk/src/libtracker-common/Makefile.am
   trunk/src/libtracker-data/Makefile.am
   trunk/src/libtracker-db/Makefile.am
   trunk/src/libtracker-gtk/Makefile.am
   trunk/src/libtracker/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar 19 12:16:25 2009
@@ -22,6 +22,15 @@
 # This is the X.Y used in -llibtracker-FOO-X.Y
 m4_define([tracker_api_version], [0.6])
 
+# libtool version related macros
+m4_define([tracker_lt_release], [tracker_major_version.tracker_minor_version])
+m4_define([tracker_lt_current],
+          [m4_eval(100 * tracker_minor_version + tracker_micro_version - tracker_interface_age)])
+m4_define([tracker_lt_revision], [tracker_interface_age])
+m4_define([tracker_lt_age], [m4_eval(tracker_binary_age - tracker_interface_age)])
+m4_define([tracker_lt_current_minus_age],
+          [m4_eval(tracker_lt_current - tracker_lt_age)])
+
 # Define a string for the earliest version that this release has
 # backwards binary compatibility with for all interfaces a module
 # might. Unless we add module-only API with lower stability
@@ -61,6 +70,18 @@
 
 AC_SUBST(PACKAGE_URL, [http://www.tracker-project.org])
 
+# libtool versioning
+LT_RELEASE=tracker_lt_release
+LT_CURRENT=tracker_lt_current
+LT_REVISION=tracker_lt_revision
+LT_AGE=tracker_lt_age
+LT_CURRENT_MINUS_AGE=tracker_lt_current_minus_age
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LN_S

Modified: trunk/src/libinotify/Makefile.am
==============================================================================
--- trunk/src/libinotify/Makefile.am	(original)
+++ trunk/src/libinotify/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -4,7 +4,7 @@
 	-DG_LOG_DOMAIN=\"libinotify\"			\
 	-I$(top_srcdir)/src				\
 	$(WARN_CFLAGS)					\
- 	$(GCOV_CFLAGS)					\
+	$(GCOV_CFLAGS)					\
 	$(GLIB2_CFLAGS)
 
 noinst_LTLIBRARIES = libinotify.la
@@ -19,7 +19,9 @@
 	inotify-log.h 					\
 	libinotify.h
 
-libinotify_la_LDFLAGS = -version-info 0:0:0
+libinotify_la_LDFLAGS = 				\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 libinotify_la_LIBADD = 					\
 	$(GLIB2_LIBS)                                   \
 	$(GCOV_LIBS)

Modified: trunk/src/libstemmer/Makefile.am
==============================================================================
--- trunk/src/libstemmer/Makefile.am	(original)
+++ trunk/src/libstemmer/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -50,5 +50,6 @@
 
 
 libstemmer_la_LIBADD = $(GCOV_LIBS)
-libstemmer_la_LDFLAGS = -version-info 0:0:0
+libstemmer_la_LDFLAGS = 		\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 

Modified: trunk/src/libtracker-common/Makefile.am
==============================================================================
--- trunk/src/libtracker-common/Makefile.am	(original)
+++ trunk/src/libtracker-common/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -76,7 +76,9 @@
 	tracker-type-utils.h				\
 	tracker-utils.h
 
-libtracker_common_la_LDFLAGS = -version-info 0:0:0
+libtracker_common_la_LDFLAGS = 				\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 libtracker_common_la_LIBADD = 				\
 	$(top_builddir)/src/libstemmer/libstemmer.la	\
 	$(HAL_LIBS)					\

Modified: trunk/src/libtracker-data/Makefile.am
==============================================================================
--- trunk/src/libtracker-data/Makefile.am	(original)
+++ trunk/src/libtracker-data/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -40,7 +40,9 @@
 	tracker-rdf-query.h						\
 	tracker-turtle.h						
 
-libtracker_data_la_LDFLAGS = -version-info 0:0:0
+libtracker_data_la_LDFLAGS =						\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 libtracker_data_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la		\

Modified: trunk/src/libtracker-db/Makefile.am
==============================================================================
--- trunk/src/libtracker-db/Makefile.am	(original)
+++ trunk/src/libtracker-db/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -37,7 +37,9 @@
 	tracker-db-interface-sqlite.h					\
 	tracker-db-manager.h 
 
-libtracker_db_la_LDFLAGS = -version-info 0:0:0
+libtracker_db_la_LDFLAGS =						\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 libtracker_db_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(SQLITE3_LIBS)							\

Modified: trunk/src/libtracker-gtk/Makefile.am
==============================================================================
--- trunk/src/libtracker-gtk/Makefile.am	(original)
+++ trunk/src/libtracker-gtk/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -30,5 +30,5 @@
 	$(LIBTRACKERGTK_LIBS) 					\
 	$(GCOV_LIBS)
 
-libtracker_gtk_la_LDFLAGS = -version-info 0:0:0
-
+libtracker_gtk_la_LDFLAGS = 					\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

Modified: trunk/src/libtracker/Makefile.am
==============================================================================
--- trunk/src/libtracker/Makefile.am	(original)
+++ trunk/src/libtracker/Makefile.am	Thu Mar 19 12:16:25 2009
@@ -12,13 +12,16 @@
 lib_LTLIBRARIES = libtrackerclient.la
 
 libtrackerclient_la_SOURCES = tracker.c
-libtrackerclient_la_LDFLAGS = -version-info 0:0:0
+
+libtrackerclient_la_LDFLAGS = 			\
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
 libtrackerclient_la_LIBADD = 			\
 	$(GLIB2_LIBS) 				\
 	$(DBUS_LIBS)				\
 	$(GCOV_LIBS)				\
 	$(GOBJECT_LIBS)
-	
+
 include_HEADERS = 				\
 	tracker.h				\
 	$(BUILT_SOURCES)