X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=67e7fe4545b72aa59904240bcc84a182fea61ccc;hp=51d755784ed6847696557f24766abceaf4d91dc5;hb=9a3633697faff9b12a64b6d727444eb370fd2340;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 51d755784..67e7fe454 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -14,8 +14,6 @@ LIBCOMMON=$(top_builddir)/src/common/libcommon.la
 LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
 
-EXTRA_DIST = run.sh
-
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
 else
@@ -24,34 +22,50 @@ endif
 
 # URI unit tests
 test_uri_SOURCES = test_uri.c
-test_uri_LDADD = $(LIBTAP) $(LIBCOMMON)
+test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # Session unit test
-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
+SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.o	\
+	 $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \
+	 $(top_srcdir)/src/bin/lttng-sessiond/health.o \
+	 $(top_srcdir)/src/common/uri.o \
+	 $(top_srcdir)/src/common/utils.o \
+	 $(top_srcdir)/src/common/error.o
 
-test_session_SOURCES = test_session.c $(SESSIONS)
-test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_session_SOURCES = test_session.c
+test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+					 -lrt
+test_session_LDADD += $(SESSIONS)
 
 # UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
-UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.c \
-	       $(top_srcdir)/src/bin/lttng-sessiond/consumer.c	\
-	       $(top_srcdir)/src/common/uri.c			\
-	       $(top_srcdir)/src/common/utils.c
+UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.o \
+	       $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/buffer-registry.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/ust-registry.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/ust-metadata.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/ust-app.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/ust-consumer.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/fd-limit.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/health.o \
+		   $(top_srcdir)/src/bin/lttng-sessiond/session.o \
+		   $(top_srcdir)/src/common/uri.o \
+		   $(top_srcdir)/src/common/utils.o
 
-test_ust_data_SOURCES = test_ust_data.c $(UST_DATA_TRACE)
-test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_ust_data_SOURCES = test_ust_data.c
+test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+					  -lrt -llttng-ust-ctl
+test_ust_data_LDADD += $(UST_DATA_TRACE)
 endif
 
 # Kernel data structures unit test
-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 				\
-		$(top_srcdir)/src/common/utils.c
+KERN_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-kernel.o	\
+		$(top_srcdir)/src/bin/lttng-sessiond/consumer.o	\
+		$(top_srcdir)/src/bin/lttng-sessiond/health.o \
+		$(top_srcdir)/src/common/uri.o \
+		$(top_srcdir)/src/common/utils.o
 
-test_kernel_data_SOURCES = test_kernel_data.c $(KERN_DATA_TRACE)
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE)
+test_kernel_data_SOURCES = test_kernel_data.c
+test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
+						 -lrt
+test_kernel_data_LDADD += $(KERN_DATA_TRACE)