X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=27570566b509c093d542ff266710aa5beae4d848;hp=29b8ba4f925d8d519dcff407e9f2acd33b521fa1;hb=8acbe07dff3442a327b08e1398fadfde3ace77c3;hpb=897b8e238be8ce71c0d484c31155fc8390cda6f0

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29b8ba4f9..27570566b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,13 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall
+SUBDIRS = . tools kernel
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace
+AM_CFLAGS = -g -Wall
+AM_LDFLAGS = -lurcu -lurcu-cds
 
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace.c
+EXTRA_DIST = run-report.py test_list.py utils.sh utils.h
 
-test_sessions_SOURCES = test_sessions.c $(SESSIONS)
-
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(KERN_DATA_TRACE)
+if HAVE_LIBLTTNG_UST_CTL
+SUBDIRS += ust
+endif # HAVE_LIBLTTNG_UST_CTL
 
 check-am:
 	./runall.sh