From: David Goulet <dgoulet@efficios.com>
Date: Thu, 20 Jun 2013 17:39:41 +0000 (-0400)
Subject: Fix: --disable-static option
X-Git-Tag: v2.2.0-rc3~1
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=f83ffb06f3b371658f2bfa2db1c47d1b41f35ea2

Fix: --disable-static option

Fixes #562

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 247178177..ea208d70a 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -30,9 +30,9 @@ SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.o	\
 	 $(top_srcdir)/src/bin/lttng-sessiond/consumer.o \
 	 $(top_srcdir)/src/bin/lttng-sessiond/utils.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
+	 $(top_srcdir)/src/common/.libs/uri.o \
+	 $(top_srcdir)/src/common/.libs/utils.o \
+	 $(top_srcdir)/src/common/.libs/error.o
 
 test_session_SOURCES = test_session.c
 test_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -52,8 +52,8 @@ UST_DATA_TRACE=$(top_srcdir)/src/bin/lttng-sessiond/trace-ust.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
+		   $(top_srcdir)/src/common/.libs/uri.o \
+		   $(top_srcdir)/src/common/.libs/utils.o
 
 test_ust_data_SOURCES = test_ust_data.c
 test_ust_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -66,8 +66,8 @@ 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/bin/lttng-sessiond/utils.o \
-		$(top_srcdir)/src/common/uri.o \
-		$(top_srcdir)/src/common/utils.o
+		$(top_srcdir)/src/common/.libs/uri.o \
+		$(top_srcdir)/src/common/.libs/utils.o
 
 test_kernel_data_SOURCES = test_kernel_data.c
 test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTABLE) \
@@ -75,8 +75,8 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSESSIOND_COMM) $(LIBHASHTAB
 test_kernel_data_LDADD += $(KERN_DATA_TRACE)
 
 # parse_size_suffix unit test
-UTILS_PARSE_SIZE_SUFFIX=$(top_srcdir)/src/common/utils.o \
-		$(top_srcdir)/src/common/runas.o
+UTILS_PARSE_SIZE_SUFFIX=$(top_srcdir)/src/common/.libs/utils.o \
+		$(top_srcdir)/src/common/.libs/runas.o
 
 test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
 test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON)