X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftools%2FMakefile.am;h=4fe494cec2c37df0cd72e1f1ff2e5d3f323eec0d;hp=d13868025336c34678e8d11a66384a00671b42b4;hb=3e230f922d67f7a47b66631f7a8cf458002b3727;hpb=355f483d1713d1e047ad6256bea039cb693ae38e

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index d13868025..4fe494cec 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,24 +1,41 @@
-AM_CFLAGS = -g -Wall -I../
-AM_LDFLAGS = -lurcu -lurcu-cds
+SUBDIRS = streaming filtering health
+
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall
+AM_LDFLAGS = -lurcu
 
 EXTRA_DIST = runall.sh
 
-noinst_PROGRAMS = test_sessions test_kernel_data_trace test_ust_data_trace
+noinst_PROGRAMS = test_sessions test_kernel_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
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
+UTILS=../utils.h
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c \
+		 $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
+		 $(top_srcdir)/src/common/uri.c \
+		 $(top_srcdir)/src/common/utils.c \
+		 $(top_srcdir)/src/common/error.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c \
+				$(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
+				$(top_srcdir)/src/common/uri.c \
+				$(top_srcdir)/src/common/utils.c
 COMMON=$(top_builddir)/src/common/libcommon.la
 HASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
+SESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
 # Tracing sessions unit tests
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-test_sessions_LDADD = $(COMMON) $(HASHTABLE)
+test_sessions_LDADD = $(COMMON) $(HASHTABLE) $(SESSIOND_COMM)
 
 # Kernel trace data unit tests
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
+test_kernel_data_trace_LDADD = $(COMMON) $(SESSIOND_COMM) $(HASHTABLE)
 
+if HAVE_LIBLTTNG_UST_CTL
+noinst_PROGRAMS += test_ust_data_trace
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c \
+			   $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \
+			   $(top_srcdir)/src/common/uri.c \
+			   $(top_srcdir)/src/common/utils.c
 # UST trace data unit tests
 test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
-test_ust_data_trace_LDADD = $(COMMON) $(HASHTABLE)
+test_ust_data_trace_LDADD = $(COMMON) $(HASHTABLE) $(SESSIOND_COMM)
+endif