X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=188597d24a9e936c4af217823f4d48ab669e6107;hb=4350ff080fb9b00d39153752bdf5972ba5234e74;hp=5030a03f7d1c459ecf3192d2f70369159b5d0d62;hpb=6e7bc9e0a5346b2dde6d9d5d72e0d2bf3a073f54;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 5030a03f..188597d2 100644
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,8 +1,11 @@
-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 \
-				  lttng_ust_log4j.h
+	lttng_ust_log4j.h
 
 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 -llttng-ust
+liblttng_ust_log4j_jni_la_LIBADD = -lc \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la \
+	$(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la