X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=1dd8bbea7b5e3d27671c3bec78e8cd53f0acb03d;hp=95acd640b7fa56a8b16e22c105a635b2a6c549ff;hb=6816a5cb0ae2e7b7ee9e6b460629f89a2f4f99e6;hpb=ec8f26de70d4862d4fad73f844c19fabf30b19c8

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 95acd640b..1dd8bbea7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,40 +1,38 @@
 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 lttng/runall.sh lttng/run-kernel-tests.sh
+EXTRA_DIST = runall.sh utils.sh lttng/runall.sh lttng/run-kernel-tests.sh
 
 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)
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust-nevents ust-nprocesses
-EXTRA_DIST += lttng/run-ust-tests.sh
+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)