summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e6e508c)
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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I6fe0157e23f13cd69c436111a2e743fa1c763d64
lttng-ust-cyg-profile.h
liblttng_ust_cyg_profile_la_LIBADD = \
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 = \
$(DL_LIBS)
liblttng_ust_cyg_profile_fast_la_SOURCES = \
lttng-ust-cyg-profile-fast.h
liblttng_ust_cyg_profile_fast_la_LIBADD = \
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
$(DL_LIBS)
dist_noinst_SCRIPTS = run run-fast
nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.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
nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h
liblttng_ust_jul_jni_la_LIBADD = -lc \
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
nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h
liblttng_ust_log4j_jni_la_LIBADD = -lc \
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
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_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
$(jarfile): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
ust_libc.h
liblttng_ust_libc_wrapper_la_LIBADD = \
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 = \
$(DL_LIBS)
liblttng_ust_pthread_wrapper_la_SOURCES = \
ust_pthread.h
liblttng_ust_pthread_wrapper_la_LIBADD = \
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
$(DL_LIBS)
dist_noinst_SCRIPTS = run
AM_CPPFLAGS = -I$(top_srcdir)/include/ \
-I$(top_builddir)/include/
AM_CFLAGS += -fno-strict-aliasing
AM_CPPFLAGS = -I$(top_srcdir)/include/ \
-I$(top_builddir)/include/
AM_CFLAGS += -fno-strict-aliasing
lib_LTLIBRARIES = liblttng-ust-python-agent.la
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_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