X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fust%2FMakefile.am;h=c59829051f2d9da9fe79a1d0cbcd2b31a9ae3fe0;hp=1c8295cccf57ae59ece60ddcd6ef2db17a2e3708;hb=321d0ee36e3c7f9d38647cb171f5760f4278c784;hpb=b19155c048f4cb6be12d402f1708e2e4ff80fa98

diff --git a/tests/ust/Makefile.am b/tests/ust/Makefile.am
index 1c8295ccc..c59829051 100644
--- a/tests/ust/Makefile.am
+++ b/tests/ust/Makefile.am
@@ -1,18 +1,28 @@
 if HAVE_LIBLTTNG_UST_CTL
-SUBDIRS = nevents nprocesses high-throughput low-throughput before-after
+SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \
+		  overlap
 
-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_all_events_basic
+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
+UTILS=../utils.h
+LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
 
-ust_global_all_events_basic_SOURCES = ust_global_all_events_basic.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