X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=d3a88b45f6d3e5bfb3c8e1e8d26ea46152a97a88;hb=6e8e8cb8d7b69e42dbc4c3702f6778d58d4a2371;hp=07384f8d6a6759b197985bf0e21b35a2dff588b8;hpb=d60dfbe48a0ceff16852f46419bcbc405502c61d;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am
index 07384f8d..d3a88b45 100644
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,8 +1,23 @@
-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
+liblttng_ust_log4j_jni_la_SOURCES = \
+	lttng_ust_log4j_tp.c \
+	lttng_ust_log4j_tp.h
+nodist_liblttng_ust_log4j_jni_la_SOURCES =
+
+if BUILD_JAVA_AGENT_WITH_LOG4J
+liblttng_ust_log4j_jni_la_SOURCES += lttng_ust_log4j.c
+nodist_liblttng_ust_log4j_jni_la_SOURCES += org_lttng_ust_agent_log4j_LttngLog4jApi.h
+endif
 
-nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLogAppender.h
+if BUILD_JAVA_AGENT_WITH_LOG4J2
+liblttng_ust_log4j_jni_la_SOURCES += lttng_ust_log4j2.c
+nodist_liblttng_ust_log4j_jni_la_SOURCES += org_lttng_ust_agent_log4j2_LttngLog4j2Api.h
+endif
 
-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