Implement filter bytecode support in lttng-session, and parse filter string

[lttng-tools.git] / tests / ust / Makefile.am

diff --git a/tests/ust/Makefile.am b/tests/ust/Makefile.am
index 7c7bcba41a813c99189e8336e924830248f05fbe..146bff250b0197004e3170cfb4953a948458c75a 100644 (file)
--- a/tests/ust/Makefile.am
+++ b/tests/ust/Makefile.am
@@ -1,18 +1,27 @@
 if HAVE_LIBLTTNG_UST_CTL
-SUBDIRS = nprocesses high-throughput low-throughput before-after
+SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session
 
 AM_CFLAGS = -g -Wall -I../
 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
+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