Fix: Don't override user variables within the build system

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

diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am
index 7acbccdb7f1081dca446783f83ec4cfafda870d0..5e5fe0fcf1ffc238ea39ca802f3ce75b8f97c1a3 100644 (file)
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,8 +1,13 @@
-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_LTTngLogAppender.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 \
+       -L$(top_builddir)/liblttng-ust/.libs \
+       -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
+       -llttng-ust-context-jni \
+       -llttng-ust