X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fust%2FMakefile.am;h=387842d11a6d105142d69e47042ac104fdcb14c6;hp=fee5c840214868849ee8376ade88c028aa67b07d;hb=f3f0db50cf3fbc658bb4ffaf79a7fb694ab05e1d;hpb=0d37f2bce95a09b86a1afde525c429d0ae7d19e9

diff --git a/tests/ust/Makefile.am b/tests/ust/Makefile.am
index fee5c8402..387842d11 100644
--- a/tests/ust/Makefile.am
+++ b/tests/ust/Makefile.am
@@ -1,19 +1,27 @@
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session
 
-AM_CFLAGS = -g -Wall -I../
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests -I$(top_srcdir)/src -g -Wall 
 AM_LDFLAGS = -lurcu -lurcu-cds
 
-EXTRA_DIST = runall.sh utils.sh run-ust-global-tests.sh
+EXTRA_DIST = runall.sh run-ust-global-tests.sh
 
 noinst_PROGRAMS = ust_global_event_basic ust_global_event_wildcard
 
-UTILS=utils.h
-LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
-		 $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
-		 $(top_srcdir)/src/common/sessiond-comm/unix.c
+UTILS=../utils.h
+LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
-ust_global_event_wildcard_SOURCES = ust_global_event_wildcard.c $(UTILS) $(LIBLTTNG)
+SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
+		 $(top_srcdir)/src/common/sessiond-comm/unix.c \
+		 $(top_srcdir)/src/common/sessiond-comm/inet.c \
+		 $(top_srcdir)/src/common/sessiond-comm/inet6.c
+
+ust_global_event_wildcard_SOURCES = ust_global_event_wildcard.c $(UTILS) \
+		$(SESSIONDSRC)
+ust_global_event_wildcard_LDADD = $(LIBLTTNG)
+
+ust_global_event_basic_SOURCES = ust_global_event_basic.c $(UTILS) \
+		$(SESSIONDSRC)
+ust_global_event_basic_LDADD = $(LIBLTTNG)
 
-ust_global_event_basic_SOURCES = ust_global_event_basic.c $(UTILS) $(LIBLTTNG)
 endif