Use libtool syntax in LDADD

[lttng-ust.git] / liblttng-ust-java-agent / jni / common / Makefile.am

diff --git a/liblttng-ust-java-agent/jni/common/Makefile.am b/liblttng-ust-java-agent/jni/common/Makefile.am
index 704f2bb03e46b9d50a6c57cb9d3c56c7d499311c..1baf306d83368bd0ba6d231cba1a670adab66b9d 100644 (file)
--- a/liblttng-ust-java-agent/jni/common/Makefile.am
+++ b/liblttng-ust-java-agent/jni/common/Makefile.am
@@ -1,8 +1,9 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
 
 lib_LTLIBRARIES = liblttng-ust-context-jni.la
 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