From 1b83271bb496e994fdb6ba4047e88824ec391d43 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 8 Jun 2017 13:13:07 -0400 Subject: [PATCH] Fix build with BUILT_IN_PLUGINS=1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Changes: * Make library always depend on its convenience libraries. Since the library is not linked with --whole-archive in the CLI when BUILT_IN_PLUGINS=1 (like plugins are), it's okay for it to include convenience symbols. * Do not build tests/lib/test_plugin when BUILT_IN_PLUGINS=1 * Do not build tests/plugins when BUILT_IN_PLUGINS=1 Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- include/babeltrace/logging-internal.h | 2 ++ lib/Makefile.am | 11 ++++------- tests/Makefile.am | 6 +++++- tests/lib/Makefile.am | 23 +++++++++++++---------- tests/plugins/Makefile.am | 6 +++++- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/include/babeltrace/logging-internal.h b/include/babeltrace/logging-internal.h index 21e3a0fd..d7a10a13 100644 --- a/include/babeltrace/logging-internal.h +++ b/include/babeltrace/logging-internal.h @@ -954,6 +954,8 @@ extern "C" { * bt_log_set_output_v(BT_LOG_OUT_STDERR); */ enum { BT_LOG_OUT_STDERR_MASK = BT_LOG_PUT_STD }; + +BT_HIDDEN void bt_log_out_stderr_callback(const bt_log_message *const msg, void *arg); #define BT_LOG_OUT_STDERR BT_LOG_OUT_STDERR_MASK, 0, bt_log_out_stderr_callback diff --git a/lib/Makefile.am b/lib/Makefile.am index 6a35b8f8..c7e36880 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,15 +12,12 @@ libbabeltrace_la_LIBADD = \ graph/libgraph.la \ plugin/libplugin.la \ ctf-ir/libctf-ir.la \ - ctf-writer/libctf-writer.la + ctf-writer/libctf-writer.la \ + $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/common/libbabeltrace-common.la \ + $(top_builddir)/compat/libcompat.la if BUILT_IN_PYTHON_PLUGIN_SUPPORT libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la endif -if !BUILT_IN_PLUGINS -libbabeltrace_la_LIBADD += \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/compat/libcompat.la -endif diff --git a/tests/Makefile.am b/tests/Makefile.am index a9bd7991..27c904ad 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,9 @@ -SUBDIRS = utils cli lib bindings plugins +SUBDIRS = utils cli lib bindings EXTRA_DIST = $(srcdir)/ctf-traces/** \ $(srcdir)/debug-info-data/** \ $(srcdir)/debug-info-data/.build-id/cd/** + +if !BUILT_IN_PLUGINS +SUBDIRS += plugins +endif diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 6f816f4b..ca5ffc3f 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = test-plugin-plugins writer . +SUBDIRS = writer . AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils @@ -17,8 +17,7 @@ test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la test_ctf_writer_LDADD = $(COMMON_TEST_LDADD) -test_bt_values_LDADD = $(LIBTAP) \ - $(top_builddir)/lib/libbabeltrace.la +test_bt_values_LDADD = $(COMMON_TEST_LDADD) test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD) @@ -28,8 +27,6 @@ test_ir_visit_LDADD = $(COMMON_TEST_LDADD) test_bt_notification_heap_LDADD = $(COMMON_TEST_LDADD) -test_plugin_LDADD = $(COMMON_TEST_LDADD) - test_graph_topo_LDADD = $(COMMON_TEST_LDADD) test_cc_prio_map_LDADD = $(COMMON_TEST_LDADD) @@ -38,7 +35,7 @@ test_bt_notification_iterator_LDADD = $(COMMON_TEST_LDADD) noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \ test_ctf_ir_ref test_bt_ctf_field_type_validation test_ir_visit \ - test_bt_notification_heap test_plugin test_graph_topo \ + test_bt_notification_heap test_graph_topo \ test_cc_prio_map test_bt_notification_iterator test_bitfield_SOURCES = test_bitfield.c @@ -48,13 +45,11 @@ test_ctf_ir_ref_SOURCES = test_ctf_ir_ref.c test_bt_ctf_field_type_validation_SOURCES = test_bt_ctf_field_type_validation.c test_ir_visit_SOURCES = test_ir_visit.c test_bt_notification_heap_SOURCES = test_bt_notification_heap.c -test_plugin_SOURCES = test_plugin.c test_graph_topo_SOURCES = test_graph_topo.c test_cc_prio_map_SOURCES = test_cc_prio_map.c test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.c -check_SCRIPTS = test_ctf_writer_complete \ - test_plugin_complete +check_SCRIPTS = test_ctf_writer_complete #FIXME #if ENABLE_DEBUG_INFO @@ -84,7 +79,6 @@ TESTS = test_bitfield \ test_bt_ctf_field_type_validation \ test_ir_visit \ test_bt_notification_heap \ - test_plugin_complete \ test_graph_topo \ test_cc_prio_map \ test_bt_notification_iterator @@ -99,3 +93,12 @@ TESTS += writer/test_ctf_writer_no_packet_context.py \ writer/test_ctf_writer_empty_packet.py endif + +if !BUILT_IN_PLUGINS +noinst_PROGRAMS += test_plugin +test_plugin_LDADD = $(COMMON_TEST_LDADD) +test_plugin_SOURCES = test_plugin.c +TESTS += test_plugin_complete +check_SCRIPTS += test_plugin_complete +SUBDIRS += test-plugin-plugins +endif diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index b2fd059b..200072c0 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -1,7 +1,11 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -COMMON_TEST_LDADD = $(LIBTAP) $(top_builddir)/lib/libbabeltrace.la +COMMON_TEST_LDADD = $(LIBTAP) \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/common/libbabeltrace-common.la \ + $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/compat/libcompat.la noinst_PROGRAMS = test-utils-muxer -- 2.34.1