X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftools%2FMakefile.am;h=4fe494cec2c37df0cd72e1f1ff2e5d3f323eec0d;hp=074c8ec8f516876426c958429017561af85abd7d;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hpb=07424f161f4afbd07fd165e4ae492726e1de7769

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 074c8ec8f..4fe494cec 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,7 +1,7 @@
-SUBDIRS = streaming
+SUBDIRS = streaming filtering health
 
-AM_CFLAGS = -g -Wall -I../
-AM_LDFLAGS = -lurcu -lurcu-cds
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall
+AM_LDFLAGS = -lurcu
 
 EXTRA_DIST = runall.sh
 
@@ -11,7 +11,8 @@ 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/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 \
@@ -26,7 +27,7 @@ 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)
+test_kernel_data_trace_LDADD = $(COMMON) $(SESSIOND_COMM) $(HASHTABLE)
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data_trace