X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=1dd8bbea7b5e3d27671c3bec78e8cd53f0acb03d;hp=8b13eac14cc3b38e4a0a23ce8461583aac0a5aad;hb=10a8a2237343699e3923d87e24dbf2d7fe225377;hpb=734f79bf717d87817623d382c59086dc9e8ef610

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b13eac14..1dd8bbea7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = .
 
-AM_CFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/libkernelctl \
-		  -I$(top_srcdir)/liblttngctl -g -Wall -lurcu -lurcu-cds
+AM_CFLAGS=-g -Wall -lurcu -lurcu-cds
 
 EXTRA_DIST = runall.sh utils.sh lttng/runall.sh lttng/run-kernel-tests.sh
 
@@ -9,18 +8,17 @@ noinst_PROGRAMS = test_sessions test_kernel_data_trace \
 				  kernel_all_events_basic kernel_event_basic
 
 UTILS=utils.h
-SESSIONS=$(top_srcdir)/lttng-sessiond/session.c
-KERN_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-kernel.c
-LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \
-		 $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.c
+LIBLTTNG=$(top_srcdir)/src/lib/lttng-ctl/lttng-ctl.c \
+		 $(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c
 
 test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS)
-test_sessions_LDADD = $(top_builddir)/common/libcommon.la \
-					  $(top_builddir)/liblttng-ht/liblttng-ht.la
+test_sessions_LDADD = $(top_builddir)/src/common/libcommon.la \
+					  $(top_builddir)/src/common/hashtable/libhashtable.la
 
 test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE)
 
-
 kernel_all_events_basic_SOURCES = lttng/kernel_all_events_basic.c $(UTILS) $(LIBLTTNG)
 
 kernel_event_basic_SOURCES = lttng/kernel_event_basic.c $(UTILS) $(LIBLTTNG)
@@ -30,11 +28,11 @@ SUBDIRS += ust-nevents ust-nprocesses
 EXTRA_DIST += lttng/run-ust-global-tests.sh
 noinst_PROGRAMS += ust_global_event_basic ust_global_all_events_basic test_ust_data_trace
 
-UST_DATA_TRACE=$(top_srcdir)/lttng-sessiond/trace-ust.c
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c
 
 test_ust_data_trace_SOURCES = test_ust_data_trace.c $(UTILS) $(UST_DATA_TRACE)
-test_ust_data_trace_LDADD = $(top_builddir)/common/libcommon.la \
-							$(top_builddir)/liblttng-ht/liblttng-ht.la
+test_ust_data_trace_LDADD = $(top_builddir)/src/common/libcommon.la \
+							$(top_builddir)/src/common/hashtable/libhashtable.la
 
 ust_global_all_events_basic_SOURCES = lttng/ust_global_all_events_basic.c $(UTILS) $(LIBLTTNG)