Make libctfcopytrace a convenience lib. and link to it in plugins

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d50aac9de44f8dc8480b4b2d5d55d63400cdf0a9..9e4ff0879e2266065038f97a3822f6f0c14e4ab7 100644 (file)
--- 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 d37ad99fc5b97d2c4d7b370cf93fbcf8dd5bda37..97a327bbb02201c3abf36997848262f433d65f47 100644 (file)
--- 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 44b12ab72c65dc0a6b6c544f771510daacc7fcfd..cb6e9af420fdae6468d04250e4b4df1b46d25ec6 100644 (file)
--- 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 a8de1c14f4fd4b88765efc639c897560f63eca93..931607dff3627f9348748bfac68d02b529bb669f 100644 (file)
--- 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