From 1001baa5ad87a3bb98ec136f568dbbaa33944511 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 7 Feb 2024 11:28:53 -0500 Subject: [PATCH] tests/lib: reorganize Makefile.am a bit Regroup _SOURCES variables with the corresponding _LDADD ones. Change-Id: Ib90b09688b5275789aa03d6de0a6c1584535f173 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11754 Reviewed-by: Philippe Proulx Tested-by: jenkins --- tests/lib/Makefile.am | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 721244fb..c462e3c4 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -11,24 +11,32 @@ COMMON_TEST_LDADD = \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/src/logging/liblogging.la +test_bt_values_SOURCES = test-bt-values.c test_bt_values_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la +test_fields_bin_SOURCES = test-fields-bin.cpp test_fields_bin_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la +test_bt_uuid_SOURCES = test-bt-uuid.c test_bt_uuid_LDADD = $(COMMON_TEST_LDADD) +test_trace_ir_ref_SOURCES = test-trace-ir-ref.c test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la +test_graph_topo_SOURCES = test-graph-topo.c test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la +test_simple_sink_SOURCES = test-simple-sink.c test_simple_sink_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la +test_remove_destruction_listener_in_destruction_listener_SOURCES = \ + test-remove-destruction-listener-in-destruction-listener.c test_remove_destruction_listener_in_destruction_listener_LDADD = \ $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la @@ -42,15 +50,6 @@ noinst_PROGRAMS = \ test-simple-sink \ test-trace-ir-ref -test_bt_values_SOURCES = test-bt-values.c -test_fields_bin_SOURCES = test-fields-bin.cpp -test_simple_sink_SOURCES = test-simple-sink.c -test_bt_uuid_SOURCES = test-bt-uuid.c -test_trace_ir_ref_SOURCES = test-trace-ir-ref.c -test_graph_topo_SOURCES = test-graph-topo.c -test_remove_destruction_listener_in_destruction_listener_SOURCES = \ - test-remove-destruction-listener-in-destruction-listener.c - if !ENABLE_BUILT_IN_PLUGINS noinst_PROGRAMS += test-plugins test-plugin-init-fail SUBDIRS += test-plugins-plugins test-plugin-init-fail-plugin -- 2.34.1