From 91dadb0fc9ae45e589527dfd189ae33ecee42844 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 30 May 2017 18:01:17 -0400 Subject: [PATCH] Add libbabeltrace-ctf for backwards compat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- Makefile.am | 7 ------- lib/Makefile.am | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4c6b4d37..8099f48b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,3 @@ dist_noinst_DATA = CodingStyle pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc - -# Create a symlink from libbabeltrace-ctf to libbabeltrace. -# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this -# file must still exist. As of Babeltrace 2, CTF writer is implemented -# in libbabeltrace, hence the symlink. -install-exec-hook: - $(LN_S) -f libbabeltrace.so $(DESTDIR)$(libdir)/libbabeltrace-ctf.so diff --git a/lib/Makefile.am b/lib/Makefile.am index 26129be7..48a95c11 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph . AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lib_LTLIBRARIES = libbabeltrace.la +lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \ @@ -22,3 +22,18 @@ if BUILT_IN_PYTHON_PLUGIN_SUPPORT libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la endif +# Build a libbabeltrace-ctf library for backwards compatibility. +# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this +# file must still exist. As of Babeltrace 2, CTF writer is implemented +# in libbabeltrace. +libbabeltrace_ctf_la_SOURCES = babeltrace.c values.c ref.c logging.c +libbabeltrace_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \ + -version-info $(BABELTRACE_LIBRARY_VERSION) + +libbabeltrace_ctf_la_LIBADD = \ + graph/libgraph.la \ + ctf-ir/libctf-ir.la \ + ctf-writer/libctf-writer.la \ + $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/common/libbabeltrace-common.la \ + $(top_builddir)/compat/libcompat.la -- 2.34.1