Use the new functions for default subbuf sizes

[lttng-tools.git] / tests / tools / Makefile.am

diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index f4cfe57b9ffa2f332b46038563fd7d084b4c9aaf..4fe494cec2c37df0cd72e1f1ff2e5d3f323eec0d 100644 (file)
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,14 +1,18 @@
-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
 
 noinst_PROGRAMS = test_sessions test_kernel_data_trace
 
 UTILS=../utils.h
-SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.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 \
@@ -19,11 +23,11 @@ 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)
+test_kernel_data_trace_LDADD = $(COMMON) $(SESSIOND_COMM) $(HASHTABLE)
 
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS += test_ust_data_trace