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

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

diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am b/liblttng-ust-java-agent/jni/jul/Makefile.am
index 40906e10ca0b191712a7bcf8da9c612acccfa31d..45bc1b5647040620434dab4a307fc9c79366cd9a 100644 (file)
--- a/liblttng-ust-java-agent/jni/jul/Makefile.am
+++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
@@ -1,9 +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-jul-jni.la
 liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
-                                 lttng_ust_jul.h
+       lttng_ust_jul.h
 
-nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngLogHandler.h
+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 -llttng-ust
+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