X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2FMakefile.am;h=be9388b1730d74255d7c2adf224b93ef1fe011d5;hb=658f12fa973b58f324b6f018672cc03222cfc7b4;hp=8bc213d7ccab107650ba588b82e3f1b83892c517;hpb=827b3af01adcd2955f5a46044156a527a906d777;p=lttng-tools.git

diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am
index 8bc213d7c..be9388b17 100644
--- a/tests/regression/tools/live/Makefile.am
+++ b/tests/regression/tools/live/Makefile.am
@@ -1,12 +1,4 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
-endif
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
@@ -15,9 +7,10 @@ LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 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/session.$(OBJEXT) \
-	 $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+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)
 
@@ -30,9 +23,9 @@ endif
 
 live_test_SOURCES = live_test.c
 live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-				  $(LIBHASHTABLE) $(LIBHEALTH) -lrt
+		$(LIBHASHTABLE) $(LIBHEALTH) $(DL_LIBS) $(LIBCOMPAT) -lrt
 live_test_LDADD += $(LIVE) \
-				   $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
+		$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \