[PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects
       [not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
@ 2016-06-09 19:11 ` Michael Jeanson
  2016-06-09 19:11 ` [PATCH lttng-tools 3/3] Fix: do not refer to objects as .o Michael Jeanson
  2016-06-14 18:56 ` [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h Jérémie Galarneau
  2 siblings, 0 replies; 3+ messages in thread
From: Michael Jeanson @ 2016-06-09 19:11 UTC (permalink / raw)
  To: lttng-dev; +Cc: jgalar

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>
---
 tests/unit/Makefile.am | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 5625cf0..b698107 100644
--- 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
-- 
2.7.4

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH lttng-tools 3/3] Fix: do not refer to objects as .o
       [not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
  2016-06-09 19:11 ` [PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects Michael Jeanson
@ 2016-06-09 19:11 ` Michael Jeanson
  2016-06-14 18:56 ` [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h Jérémie Galarneau
  2 siblings, 0 replies; 3+ messages in thread
From: Michael Jeanson @ 2016-06-09 19:11 UTC (permalink / raw)
  To: lttng-dev; +Cc: jgalar

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>
---
 tests/regression/tools/live/Makefile.am |  8 +++----
 tests/unit/Makefile.am                  | 38 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am
index 24ccc7c..8bc213d 100644
--- 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 b698107..3355e59 100644
--- 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
-- 
2.7.4

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h
       [not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
  2016-06-09 19:11 ` [PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects Michael Jeanson
  2016-06-09 19:11 ` [PATCH lttng-tools 3/3] Fix: do not refer to objects as .o Michael Jeanson
@ 2016-06-14 18:56 ` Jérémie Galarneau
  2 siblings, 0 replies; 3+ messages in thread
From: Jérémie Galarneau @ 2016-06-14 18:56 UTC (permalink / raw)
  To: Michael Jeanson; +Cc: lttng-dev, Jeremie Galarneau

All three patches are merged, thanks!

Jérémie

On Thu, Jun 9, 2016 at 3:11 PM, Michael Jeanson <mjeanson@efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
>  configure.ac           | 2 ++
>  src/common/Makefile.am | 3 +--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index c94da7a..d6149fe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -621,6 +621,8 @@ and installing the man pages.
>  AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
>  AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
>
> +AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.])
> +
>  # Python agent test
>  UST_PYTHON_AGENT="lttngust"
>
> diff --git a/src/common/Makefile.am b/src/common/Makefile.am
> index 193057c..8633730 100644
> --- a/src/common/Makefile.am
> +++ b/src/common/Makefile.am
> @@ -1,5 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
> -       -DMANPATH=\""$(mandir)"\"
> +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
>
>  AUTOMAKE_OPTIONS = subdir-objects
>
> --
> 2.7.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-06-14 18:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
2016-06-09 19:11 ` [PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects Michael Jeanson
2016-06-09 19:11 ` [PATCH lttng-tools 3/3] Fix: do not refer to objects as .o Michael Jeanson
2016-06-14 18:56 ` [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h Jérémie Galarneau

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.