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 <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
* bt_log_set_output_v(BT_LOG_OUT_STDERR);
*/
enum { BT_LOG_OUT_STDERR_MASK = BT_LOG_PUT_STD };
* bt_log_set_output_v(BT_LOG_OUT_STDERR);
*/
enum { BT_LOG_OUT_STDERR_MASK = BT_LOG_PUT_STD };
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
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
graph/libgraph.la \
plugin/libplugin.la \
ctf-ir/libctf-ir.la \
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_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
-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/**
EXTRA_DIST = $(srcdir)/ctf-traces/** \
$(srcdir)/debug-info-data/** \
$(srcdir)/debug-info-data/.build-id/cd/**
+
+if !BUILT_IN_PLUGINS
+SUBDIRS += plugins
+endif
-SUBDIRS = test-plugin-plugins writer .
AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
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)
test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD)
test_bt_notification_heap_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)
test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
test_cc_prio_map_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 \
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
test_cc_prio_map test_bt_notification_iterator
test_bitfield_SOURCES = test_bitfield.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_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
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
#FIXME
#if ENABLE_DEBUG_INFO
test_bt_ctf_field_type_validation \
test_ir_visit \
test_bt_notification_heap \
test_bt_ctf_field_type_validation \
test_ir_visit \
test_bt_notification_heap \
test_graph_topo \
test_cc_prio_map \
test_bt_notification_iterator
test_graph_topo \
test_cc_prio_map \
test_bt_notification_iterator
writer/test_ctf_writer_no_packet_context.py \
writer/test_ctf_writer_empty_packet.py
endif
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
AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
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
noinst_PROGRAMS = test-utils-muxer