X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Flog4j%2FMakefile.am;h=8fc4e11ac804faac5d789dc28d38e83c2f659be5;hb=e03d7c66c57bf268b87296566a5160039f35ccfb;hp=029462e9252df45a4ef7b681a7fa76bb3f49c47f;hpb=3081c83f06d9a65cae1507a5db358df84ed7c192;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 029462e9..8fc4e11a 100644
--- a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
@@ -1,13 +1,27 @@
+# SPDX-FileCopyrightText: 2023 EfficiOS, Inc
+#
 # SPDX-License-Identifier: LGPL-2.1-only
 
 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_log4j2_tp.c \
+	lttng_ust_log4j2_tp.h \
+	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/liblttng-ust/liblttng-ust.la \
+	$(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \
 	$(top_builddir)/src/lib/lttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la