From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 19 Feb 2014 01:25:02 +0000 (-0500)
Subject: Bump soname version to 1.0.0
X-Git-Tag: v1.2.0-rc2~32
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=3fbccce759a76c1146bbd6d2e78efffe4e7fe6ce

Bump soname version to 1.0.0

Since there were ABI changes since 0.0.0.

Also add missing -Wl,--no-as-needed to lttng-live plugin.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index 327f4ab9..ce457192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([babeltrace],[1.2.0-rc1],[mathieu dot desnoyers at efficios dot com])
+
+# Following the numbering scheme proposed by libtool for the library version
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], [1:0:0])
+
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
diff --git a/formats/bt-dummy/Makefile.am b/formats/bt-dummy/Makefile.am
index 96775df4..1d21de94 100644
--- a/formats/bt-dummy/Makefile.am
+++ b/formats/bt-dummy/Makefile.am
@@ -5,5 +5,9 @@ lib_LTLIBRARIES = libbabeltrace-dummy.la
 libbabeltrace_dummy_la_SOURCES = \
 	bt-dummy.c
 
+# Request that the linker keeps all static libraries objects.
+libbabeltrace_dummy_la_LDFLAGS = \
+	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
+
 libbabeltrace_dummy_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la
diff --git a/formats/ctf-metadata/Makefile.am b/formats/ctf-metadata/Makefile.am
index 61d08e81..f5061761 100644
--- a/formats/ctf-metadata/Makefile.am
+++ b/formats/ctf-metadata/Makefile.am
@@ -5,8 +5,9 @@ lib_LTLIBRARIES = libbabeltrace-ctf-metadata.la
 libbabeltrace_ctf_metadata_la_SOURCES = \
 	ctf-metadata.c
 
+# Request that the linker keeps all static libraries objects.
 libbabeltrace_ctf_metadata_la_LDFLAGS = \
-	-Wl,--no-as-needed
+	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_ctf_metadata_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la
diff --git a/formats/ctf-text/Makefile.am b/formats/ctf-text/Makefile.am
index a7036c96..1619df3e 100644
--- a/formats/ctf-text/Makefile.am
+++ b/formats/ctf-text/Makefile.am
@@ -8,7 +8,7 @@ libbabeltrace_ctf_text_la_SOURCES = \
 	ctf-text.c
 
 libbabeltrace_ctf_text_la_LDFLAGS = \
-	-Wl,--no-as-needed \
+	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION) \
 	types/libctf-text-types.la
 
 libbabeltrace_ctf_text_la_LIBADD = \
diff --git a/formats/ctf/Makefile.am b/formats/ctf/Makefile.am
index d79d9ef3..5d8a2970 100644
--- a/formats/ctf/Makefile.am
+++ b/formats/ctf/Makefile.am
@@ -13,7 +13,7 @@ libbabeltrace_ctf_la_SOURCES = \
 
 # Request that the linker keeps all static libraries objects.
 libbabeltrace_ctf_la_LDFLAGS = \
-	-Wl,--no-as-needed
+	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_ctf_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am
index c018138b..c8346995 100644
--- a/formats/lttng-live/Makefile.am
+++ b/formats/lttng-live/Makefile.am
@@ -9,5 +9,9 @@ noinst_HEADERS = \
 libbabeltrace_lttng_live_la_SOURCES = \
 	lttng-live-plugin.c lttng-live-comm.c
 
+# Request that the linker keeps all static libraries objects.
+libbabeltrace_lttng_live_la_LDFLAGS = \
+	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
+
 libbabeltrace_lttng_live_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4b78b477..348b0a9b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,6 +11,8 @@ libbabeltrace_la_SOURCES = babeltrace.c \
 			   trace-collection.c \
 			   registry.c
 
+libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
+
 libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.la \
 	$(top_builddir)/types/libbabeltrace_types.la \