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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77bed35ca..bc0f0a59a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,29 +1,13 @@
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall -lurcu -lurcu-cds
+SUBDIRS = . tools kernel
 
-EXTRA_DIST = runall.sh lttng/runall.sh lttng/run-kernel-tests.sh lttng/run-ust-tests.sh
+AM_CFLAGS = -g -Wall
+AM_LDFLAGS = -lurcu -lurcu-cds
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace kernel_all_events_basic \
-				  kernel_event_basic ust_global_event_basic ust_global_all_events_basic
+EXTRA_DIST = run-report.py test_list.py utils.sh utils.h runall.sh
 
-UTILS=utils.h
-SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.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_sessions_LDADD = $(top_builddir)/common/libcommon.la
-
-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)
-
-kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
-
-ust_global_all_events_basic_SOURCES = lttng/ust_global_all_events_basic.c $(UTILS) $(LIBLTTNG)
-
-ust_global_event_basic_SOURCES = lttng/ust_global_event_basic.c $(UTILS) $(LIBLTTNG)
+if HAVE_LIBLTTNG_UST_CTL
+SUBDIRS += ust
+endif # HAVE_LIBLTTNG_UST_CTL
 
 check-am:
 	./runall.sh