From 5774b889f257d1756a09ef720f22b8d7081e06fd Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 27 Apr 2017 14:53:16 -0400 Subject: [PATCH] Make libctfcopytrace a convenience lib. and link to it in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- plugins/Makefile.am | 2 +- plugins/debug-info/Makefile.am | 3 ++- plugins/libctfcopytrace/Makefile.am | 9 +++------ plugins/utils/trimmer/Makefile.am | 3 +++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d50aac9de..9e4ff0879 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = ctf text utils libctfcopytrace writer +SUBDIRS = libctfcopytrace ctf text utils writer if ENABLE_DEBUG_INFO SUBDIRS += debug-info diff --git a/plugins/debug-info/Makefile.am b/plugins/debug-info/Makefile.am index d37ad99fc..97a327bbb 100644 --- a/plugins/debug-info/Makefile.am +++ b/plugins/debug-info/Makefile.am @@ -22,4 +22,5 @@ libbabeltrace_plugin_debug_info_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) -lelf -ldw libbabeltrace_plugin_debug_info_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la diff --git a/plugins/libctfcopytrace/Makefile.am b/plugins/libctfcopytrace/Makefile.am index 44b12ab72..cb6e9af42 100644 --- a/plugins/libctfcopytrace/Makefile.am +++ b/plugins/libctfcopytrace/Makefile.am @@ -2,13 +2,10 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include SUBDIRS = . -lib_LTLIBRARIES = libctfcopytrace.la +noinst_LTLIBRARIES = libctfcopytrace.la -libctfcopytrace_la_SOURCES = ctfcopytrace.c clock-fields.c - -libctfcopytrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION) +libctfcopytrace_la_SOURCES = ctfcopytrace.c clock-fields.c \ + ctfcopytrace.h clock-fields.h libctfcopytrace_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la - -noinst_HEADERS = ctfcopytrace.h clock-fields.h diff --git a/plugins/utils/trimmer/Makefile.am b/plugins/utils/trimmer/Makefile.am index a8de1c14f..931607dff 100644 --- a/plugins/utils/trimmer/Makefile.am +++ b/plugins/utils/trimmer/Makefile.am @@ -9,3 +9,6 @@ libbabeltrace_plugin_trimmer_la_SOURCES = \ trimmer.h \ iterator.h \ copy.h + +libbabeltrace_plugin_trimmer_la_LIBADD = \ + $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la -- 2.34.1