X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=bc0f0a59afc336ffb905b37c43f90309758d01d2;hp=1419545a36a9566542462cdd1cf98ab0698f1379;hb=18eace3ba4aeaa6b869c8ad9ec1273381b4cbdee;hpb=ff3db88201d2de93d02f22d9adf0a636d72d0dd6

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