Fix: do not link against libtool .o objects

We should not link against libtool objects directly
since they have different names in static or shared
only build. Instead link on the full .la

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 5625cf0fcba42387266e90d05b4a98e5d5169f62..b6981075dcd2b759dea358c7e85bed8b51a14222 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -46,9 +46,7 @@ SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o     \
         $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
         $(top_builddir)/src/bin/lttng-sessiond/utils.o \
         $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
-        $(top_builddir)/src/common/uri.o \
-        $(top_builddir)/src/common/utils.o \
-        $(top_builddir)/src/common/error.o \
+        $(top_builddir)/src/common/libcommon.la \
         $(top_builddir)/src/common/health/libhealth.la \
         $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -72,8 +70,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
                   $(top_builddir)/src/bin/lttng-sessiond/session.o \
                   $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
                   $(top_builddir)/src/bin/lttng-sessiond/agent.o \
-                  $(top_builddir)/src/common/uri.o \
-                  $(top_builddir)/src/common/utils.o \
+                  $(top_builddir)/src/common/libcommon.la \
                   $(top_builddir)/src/common/health/libhealth.la \
                   $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -87,8 +84,7 @@ endif
 KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o  \
                $(top_builddir)/src/bin/lttng-sessiond/consumer.o       \
                $(top_builddir)/src/bin/lttng-sessiond/utils.o \
-               $(top_builddir)/src/common/uri.o \
-               $(top_builddir)/src/common/utils.o \
+               $(top_builddir)/src/common/libcommon.la \
                $(top_builddir)/src/common/health/libhealth.la \
                $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 
@@ -98,8 +94,7 @@ 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/utils.o \
-               $(top_builddir)/src/common/runas.o
+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