From ef8ce5848f54c9927465b4edb309345633cc5fd5 Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 13 May 2021 11:07:58 -0700 Subject: [PATCH] build: Use liblttng-sessiond-common.la instead of LIVE MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allow correctly linking live_test with slibtool. Signed-off-by: orbea Signed-off-by: Jérémie Galarneau Change-Id: Ie429aa36b817a3d5b22bb4bbe3d21a82c65ffdaa --- tests/regression/tools/live/Makefile.am | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am index 94333fd3b..1587deb12 100644 --- a/tests/regression/tools/live/Makefile.am +++ b/tests/regression/tools/live/Makefile.am @@ -10,11 +10,7 @@ LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la LIBHEALTH=$(top_builddir)/src/common/health/libhealth.la LIBCOMPAT=$(top_builddir)/src/common/compat/libcompat.la - -LIVE= $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \ - $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) +LIBLTTNG_SESSIOND_COMMON=$(top_builddir)/src/bin/lttng-sessiond/liblttng-sessiond-common.la noinst_PROGRAMS = live_test EXTRA_DIST = test_kernel test_lttng_kernel @@ -24,10 +20,7 @@ EXTRA_DIST += test_ust test_ust_tracefile_count test_lttng_ust endif live_test_SOURCES = live_test.c -live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \ - $(LIBHASHTABLE) $(LIBHEALTH) $(DL_LIBS) $(LIBCOMPAT) -lrt -live_test_LDADD += $(LIVE) \ - $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la +live_test_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS) all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ -- 2.34.1