X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fkernel%2FMakefile.am;h=8872af425f35d8c52812bfa4ca2015e94270652c;hb=9fec62f705e2143ae8ac72cf0ab1c36245aceda7;hp=79434cad5a4b9528d7b71b3bbb24335bdba335fe;hpb=4a18dcafa08a84bde82c3574807fc43af77670df;p=lttng-tools.git

diff --git a/tests/kernel/Makefile.am b/tests/kernel/Makefile.am
index 79434cad5..8872af425 100644
--- a/tests/kernel/Makefile.am
+++ b/tests/kernel/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -g -Wall -I../
+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 run-kernel-tests.sh
@@ -6,12 +6,17 @@ EXTRA_DIST = runall.sh run-kernel-tests.sh
 noinst_PROGRAMS = kernel_all_events_basic kernel_event_basic
 
 UTILS=../utils.h
-LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
-		 $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
+LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
+
+SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \
 		 $(top_srcdir)/src/common/sessiond-comm/unix.c \
 		 $(top_srcdir)/src/common/sessiond-comm/inet.c \
 		 $(top_srcdir)/src/common/sessiond-comm/inet6.c
 
-kernel_all_events_basic_SOURCES = kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
+kernel_all_events_basic_SOURCES = kernel_all_events_basic.c $(UTILS) \
+		$(SESSIONDSRC)
+kernel_all_events_basic_LDADD = $(LIBLTTNG)
 
-kernel_event_basic_SOURCES = kernel_event_basic.c $(UTILS) $(LIBLTTNG)
+kernel_event_basic_SOURCES = kernel_event_basic.c $(UTILS) \
+		$(SESSIONDSRC)
+kernel_event_basic_LDADD = $(LIBLTTNG)