X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=188597d24a9e936c4af217823f4d48ab669e6107;hb=4350ff080fb9b00d39153752bdf5972ba5234e74;hp=5545631dd5a4fff8d971540d7d6b60fb57937b39;hpb=426b87abe12e1ad94b4a28250571f69a60900d92;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am
index 5545631d..188597d2 100644
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,4 +1,4 @@
-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-log4j-jni.la
 liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
@@ -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