Fix: do not refer to objects as .o

The extension of object files is platform dependant,
use $(OBJEXT) instead of .o when referring to objects.

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

diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am
index 24ccc7cfc194df56563a410e9ca71c2366cacbc9..8bc213d7ccab107650ba588b82e3f1b83892c517 100644 (file)
--- a/tests/regression/tools/live/Makefile.am
+++ b/tests/regression/tools/live/Makefile.am
@@ -16,10 +16,10 @@ LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
 LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
 LIBHEALTH=$(top_builddir)/src/common/health/libhealth.la
 
-LIVE=$(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
+LIVE=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT)
 
 noinst_PROGRAMS = live_test
 EXTRA_DIST = test_kernel test_lttng_kernel

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index b6981075dcd2b759dea358c7e85bed8b51a14222..3355e59b34b7025ba39dc3c1976926ed7f455653 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -42,10 +42,10 @@ test_uri_SOURCES = test_uri.c
 test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
 
 # Session unit test
-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 \
+SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+        $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
         $(top_builddir)/src/common/libcommon.la \
         $(top_builddir)/src/common/health/libhealth.la \
         $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@ -58,18 +58,18 @@ test_session_LDADD += $(SESSIONS)
 
 # UST data structures unit test
 if HAVE_LIBLTTNG_UST_CTL
-UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
-              $(top_builddir)/src/bin/lttng-sessiond/consumer.o \
-              $(top_builddir)/src/bin/lttng-sessiond/utils.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/ust-registry.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/ust-app.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/ust-consumer.o \
-                  $(top_builddir)/src/bin/lttng-sessiond/fd-limit.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 \
+UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.$(OBJEXT) \
+              $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+              $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-registry.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/ust-metadata.$(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/fd-limit.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT) \
+                  $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
                   $(top_builddir)/src/common/libcommon.la \
                   $(top_builddir)/src/common/health/libhealth.la \
                   $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
@@ -81,9 +81,9 @@ test_ust_data_LDADD += $(UST_DATA_TRACE)
 endif
 
 # Kernel data structures unit test
-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 \
+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/common/sessiond-comm/libsessiond-comm.la