X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftools%2FMakefile.am;h=173dce21fff3beffa7e917e54487e64aa754202a;hb=5ed358a4006bf789c1dcd72d3afeed84647e0cfd;hp=9f0ba7347c63388306417f6b33edabcd86475382;hpb=4a18dcafa08a84bde82c3574807fc43af77670df;p=lttng-tools.git

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 9f0ba7347..173dce21f 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,4 +1,6 @@
-AM_CFLAGS = -g -Wall -I../
+SUBDIRS = streaming health
+
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall
 AM_LDFLAGS = -lurcu -lurcu-cds
 
 EXTRA_DIST = runall.sh
@@ -6,22 +8,34 @@ EXTRA_DIST = runall.sh
 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
+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 = $(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
+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