X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=d3a88b45f6d3e5bfb3c8e1e8d26ea46152a97a88;hb=6e8e8cb8d7b69e42dbc4c3702f6778d58d4a2371;hp=5e5fe0fcf1ffc238ea39ca802f3ce75b8f97c1a3;hpb=2f14557f4175ac05f4ea74ff858be44706118464;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 5e5fe0fc..d3a88b45 100644
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,10 +1,20 @@
 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 =
 
-nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h
+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
+
+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 \