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 327f4ab94cac184f62103872fb2d9308c6496372..ce45719227aba4a785a3000e45352ab415af042b 100644 (file)
--- 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 96775df4c37938169b781adbf24445b259b2d1ce..1d21de94286425e2af4cfc2001bd21c0ac9ab2b1 100644 (file)
--- 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 61d08e81a983273e9810500645d841efb04937c3..f5061761720ce7e116cdc9c9f08906458f3fbbd4 100644 (file)
--- 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 a7036c966c9685ee5f8d9d1cf73e2a3dcdf35dd2..1619df3e8ce3011270dd26ff5edb2a667396ab94 100644 (file)
--- 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 d79d9ef38030166725f9f80feafdc81dcb21ce76..5d8a29701eccfc4063fc71f0b699e1edbfe550f8 100644 (file)
--- 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 c018138b74f88e503a5c4c5703fd7e596e23e0b1..c8346995277e07a6ce73fd13d536e07f0df7a91b 100644 (file)
--- 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 4b78b4778f6be7f709e48b824fcefa4a7b64581c..348b0a9b2611977040911a3f8c13c195f0370026 100644 (file)
--- 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 \