From d4ae42f79c51f45fcd690ccdf079d85816402047 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 3 May 2016 11:57:58 -0400 Subject: [PATCH] Static build fix: change link order of libtestcommon.la 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 | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index a8c94488..9770db12 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -1,33 +1,30 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils -noinst_LIBRARIES = libtestcommon.a - LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -libtestcommon_a_SOURCES = common.c common.h +libtestcommon_la_SOURCES = common.c common.h +noinst_LTLIBRARIES = libtestcommon.la # -Wl,--no-as-needed is needed for recent gold linker who seems to think # 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) libtestcommon.a \ +test_seek_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la -test_bitfield_LDADD = $(LIBTAP) libtestcommon.a +test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la -test_ctf_writer_LDADD = $(LIBTAP) \ +test_ctf_writer_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la\ $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - libtestcommon.a + $(top_builddir)/formats/ctf/libbabeltrace-ctf.la test_bt_values_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la -test_ctf_ir_ref_LDADD = $(LIBTAP) \ +test_ctf_ir_ref_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \ $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - libtestcommon.a + $(top_builddir)/formats/ctf/libbabeltrace-ctf.la test_bt_ctf_field_type_validation_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la \ -- 2.34.1