From d6b40dbc5cefdbaa6be00ea05e9e0744fc794d2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 29 Jul 2016 16:56:04 -0400 Subject: [PATCH] Clean-up: use COMMON_TEST_LDADD to simplify Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/lib/Makefile.am | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 3d3b215f..b1774140 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -9,30 +9,24 @@ noinst_LTLIBRARIES = libtestcommon.la # it knows better and considers libraries with constructors having # side-effects as dead code. test_seek_LDFLAGS = $(LD_NO_AS_NEEDED) -test_seek_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \ +COMMON_TEST_LDADD = $(LIBTAP) libtestcommon.a \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la -test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la +test_seek_LDADD = $(COMMON_TEST_LDADD) -test_ctf_writer_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la\ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la +test_bitfield_LDADD = $(LIBTAP) libtestcommon.a + +test_ctf_writer_LDADD = $(COMMON_TEST_LDADD) test_bt_values_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la -test_ctf_ir_ref_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la +test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD) -test_bt_ctf_field_type_validation_LDADD = $(LIBTAP) \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la +test_bt_ctf_field_type_validation_LDADD = $(COMMON_TEST_LDADD) -test_ir_visit_LDADD = $(LIBTAP) \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la +test_ir_visit_LDADD = $(COMMON_TEST_LDADD) noinst_PROGRAMS = test_seek test_bitfield test_ctf_writer test_bt_values \ test_ctf_ir_ref test_bt_ctf_field_type_validation test_ir_visit -- 2.34.1