From: Michael Jeanson Date: Thu, 26 Mar 2020 21:18:41 +0000 (-0400) Subject: Use libtool syntax in LDADD X-Git-Tag: v2.13.0-rc1~491 X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=4350ff080fb9b00d39153752bdf5972ba5234e74 Use libtool syntax in LDADD Use .la files to add link dependencies between libraries, linking directly to the content of '.libs' is relying on an implementation detail of libtool. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I6fe0157e23f13cd69c436111a2e743fa1c763d64 --- diff --git a/liblttng-ust-cyg-profile/Makefile.am b/liblttng-ust-cyg-profile/Makefile.am index 100ca4ad..3b1e7eba 100644 --- a/liblttng-ust-cyg-profile/Makefile.am +++ b/liblttng-ust-cyg-profile/Makefile.am @@ -9,8 +9,7 @@ liblttng_ust_cyg_profile_la_SOURCES = \ lttng-ust-cyg-profile.h liblttng_ust_cyg_profile_la_LIBADD = \ - -L$(top_builddir)/liblttng-ust/.libs \ - -llttng-ust \ + $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_cyg_profile_fast_la_SOURCES = \ @@ -18,8 +17,7 @@ liblttng_ust_cyg_profile_fast_la_SOURCES = \ lttng-ust-cyg-profile-fast.h liblttng_ust_cyg_profile_fast_la_LIBADD = \ - -L$(top_builddir)/liblttng-ust/.libs \ - -llttng-ust \ + $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) dist_noinst_SCRIPTS = run run-fast diff --git a/liblttng-ust-java-agent/jni/common/Makefile.am b/liblttng-ust-java-agent/jni/common/Makefile.am index 7612932a..1baf306d 100644 --- a/liblttng-ust-java-agent/jni/common/Makefile.am +++ b/liblttng-ust-java-agent/jni/common/Makefile.am @@ -5,4 +5,5 @@ liblttng_ust_context_jni_la_SOURCES = lttng_ust_context.c lttng_ust_context.h nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h -liblttng_ust_context_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust +liblttng_ust_context_jni_la_LIBADD = -lc \ + $(top_builddir)/liblttng-ust/liblttng-ust.la diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am b/liblttng-ust-java-agent/jni/jul/Makefile.am index 45bc1b56..39ff52a0 100644 --- a/liblttng-ust-java-agent/jni/jul/Makefile.am +++ b/liblttng-ust-java-agent/jni/jul/Makefile.am @@ -7,7 +7,5 @@ liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \ nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h liblttng_ust_jul_jni_la_LIBADD = -lc \ - -L$(top_builddir)/liblttng-ust/.libs \ - -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \ - -llttng-ust-context-jni \ - -llttng-ust + $(top_builddir)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am index 5e5fe0fc..188597d2 100644 --- a/liblttng-ust-java-agent/jni/log4j/Makefile.am +++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am @@ -7,7 +7,5 @@ liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \ nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h liblttng_ust_log4j_jni_la_LIBADD = -lc \ - -L$(top_builddir)/liblttng-ust/.libs \ - -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \ - -llttng-ust-context-jni \ - -llttng-ust + $(top_builddir)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am index 4975b8b0..387ddba9 100644 --- a/liblttng-ust-java/Makefile.am +++ b/liblttng-ust-java/Makefile.am @@ -12,7 +12,8 @@ lib_LTLIBRARIES = liblttng-ust-java.la liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h -liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust +liblttng_ust_java_la_LIBADD = -lc \ + $(top_builddir)/liblttng-ust/liblttng-ust.la $(jarfile): classnoinst.stamp $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am index 0787d8d5..68aa02c7 100644 --- a/liblttng-ust-libc-wrapper/Makefile.am +++ b/liblttng-ust-libc-wrapper/Makefile.am @@ -9,8 +9,7 @@ liblttng_ust_libc_wrapper_la_SOURCES = \ ust_libc.h liblttng_ust_libc_wrapper_la_LIBADD = \ - -L$(top_builddir)/liblttng-ust/.libs \ - -llttng-ust \ + $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_pthread_wrapper_la_SOURCES = \ @@ -18,8 +17,7 @@ liblttng_ust_pthread_wrapper_la_SOURCES = \ ust_pthread.h liblttng_ust_pthread_wrapper_la_LIBADD = \ - -L$(top_builddir)/liblttng-ust/.libs \ - -llttng-ust \ + $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) dist_noinst_SCRIPTS = run diff --git a/liblttng-ust-python-agent/Makefile.am b/liblttng-ust-python-agent/Makefile.am index 2c6668ae..077e50c5 100644 --- a/liblttng-ust-python-agent/Makefile.am +++ b/liblttng-ust-python-agent/Makefile.am @@ -2,7 +2,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include/ \ -I$(top_builddir)/include/ AM_CFLAGS += -fno-strict-aliasing + lib_LTLIBRARIES = liblttng-ust-python-agent.la + liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h -liblttng_ust_python_agent_la_LIBADD = -lc -llttng-ust \ - -L$(top_builddir)/liblttng-ust/.libs +liblttng_ust_python_agent_la_LIBADD = -lc \ + $(top_builddir)/liblttng-ust/liblttng-ust.la