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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25351dd51..27570566b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,21 +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 kernel_all_events_basic
+EXTRA_DIST = run-report.py test_list.py utils.sh utils.h
 
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/ltt-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/ltt-sessiond/trace.c
-LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
-		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
-
-test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
-
-kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
+if HAVE_LIBLTTNG_UST_CTL
+SUBDIRS += ust
+endif # HAVE_LIBLTTNG_UST_CTL
 
 check-am:
 	./runall.sh