X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2FMakefile.am;h=5f485f007b7d3bf4ca874d4482f73c7faa5ef3b5;hp=0f8a8bb1db3f545af0025913dc7a481581fed3fc;hb=645a0d9a7c5753b46b2bf239fea98b47729f5b14;hpb=a7333da73c2083281c5ec833d041b7acf0d10d0b

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 0f8a8bb1d..5f485f007 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -41,7 +41,6 @@ test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS)
 
 # Sessiond objects
 SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
-	 $(top_builddir)/src/bin/lttng-sessiond/load-session-thread.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/cmd.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/save.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
@@ -52,7 +51,6 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT)
 	 $(top_builddir)/src/bin/lttng-sessiond/lttng-syscall.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/channel.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
-	 $(top_builddir)/src/bin/lttng-sessiond/ready.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/kernel-consumer.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/rotation-thread.$(OBJEXT) \
@@ -71,6 +69,7 @@ SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT)
 	 $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/thread-utils.$(OBJEXT) \
 	 $(top_builddir)/src/bin/lttng-sessiond/process-utils.$(OBJEXT) \
+	 $(top_builddir)/src/bin/lttng-sessiond/thread.$(OBJEXT) \
 	 $(top_builddir)/src/common/libcommon.la \
 	 $(top_builddir)/src/common/testpoint/libtestpoint.la \
 	 $(top_builddir)/src/common/compat/libcompat.la \
@@ -82,7 +81,7 @@ SESSIOND_OBJS += $(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/ust-app.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.$(OBJEXT) \
-		 $(top_builddir)/src/bin/lttng-sessiond/ust-thread.$(OBJEXT) \
+		 $(top_builddir)/src/bin/lttng-sessiond/notify-apps.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/agent-thread.$(OBJEXT) \
 		 $(top_builddir)/src/bin/lttng-sessiond/ust-field-utils.$(OBJEXT)
@@ -127,10 +126,8 @@ endif
 KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
 		$(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
 		$(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
-		$(top_builddir)/src/common/libcommon.la \
 		$(top_builddir)/src/common/health/libhealth.la \
 		$(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
-		$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
 		$(LIBLTTNG_CTL)
 
 test_kernel_data_SOURCES = test_kernel_data.c
@@ -139,22 +136,18 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)
 test_kernel_data_LDADD += $(KERN_DATA_TRACE)
 
 # utils suffix for unit test
-UTILS_SUFFIX=$(top_builddir)/src/common/libcommon.la
 
 # parse_size_suffix unit test
 test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
 test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS)
-test_utils_parse_size_suffix_LDADD += $(UTILS_SUFFIX)
 
 # parse_time_suffix unit test
 test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c
 test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)
-test_utils_parse_time_suffix_LDADD += $(UTILS_SUFFIX)
 
 # expand_path unit test
 test_utils_expand_path_SOURCES = test_utils_expand_path.c
 test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS)
-test_utils_expand_path_LDADD += $(UTILS_SUFFIX)
 
 # string utilities unit test
 test_string_utils_SOURCES = test_string_utils.c