X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=bc1db2484a959659e1ee3c6441cbfb69feccb9da;hb=464c475658ae29039b3b9e769b5b02195688a94a;hp=8d95257418abc05db83ba05a0e551472cfc29b1b;hpb=08c1dfc43e014a99cd47202f6b370f8afa33e4c8;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
index 8d952574..bc1db248 100644
--- a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
@@ -3,10 +3,20 @@
 AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(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 ENABLE_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 ENABLE_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 \
 	$(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \