build: Use liblttng-sessiond-common.la instead of LIVE
authororbea <orbea@riseup.net>
Thu, 13 May 2021 18:07:58 +0000 (11:07 -0700)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 7 Jun 2021 15:05:04 +0000 (11:05 -0400)
This allow correctly linking live_test with slibtool.

Signed-off-by: orbea <orbea@riseup.net>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ie429aa36b817a3d5b22bb4bbe3d21a82c65ffdaa

tests/regression/tools/live/Makefile.am

index 94333fd3bfcb5998ad4bd3702a7b5c67e4fe100a..1587deb12adfee037689cf23d5ae92a0a619d761 100644 (file)
@@ -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 \
This page took 0.026597 seconds and 4 git commands to generate.