-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
- -I$(top_srcdir)/liblttngctl -g -Wall
+SUBDIRS = .
-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 = runall.sh utils.sh lttng/runall.sh lttng/run-kernel-tests.sh
-test_sessions_SOURCES = test_sessions.c $(SESSIONS)
+noinst_PROGRAMS = test_sessions test_kernel_data_trace \
+ kernel_all_events_basic kernel_event_basic
-test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(KERN_DATA_TRACE)
+UTILS=utils.h
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c
+LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
+ $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c
+
+test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
+test_sessions_LDADD = $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/common/hashtable/libhashtable.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)
+
+if HAVE_LIBLTTNG_UST_CTL
+SUBDIRS += ust-nevents ust-nprocesses
+EXTRA_DIST += lttng/run-ust-global-tests.sh
+noinst_PROGRAMS += ust_global_event_basic ust_global_all_events_basic test_ust_data_trace
+
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
+
+test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
+test_ust_data_trace_LDADD = $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/common/hashtable/libhashtable.la
+
+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)
+endif # HAVE_LIBLTTNG_UST_CTL
check-am:
./runall.sh