X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2FMakefile.am;h=009f14167e6285d8a245a933ec0b7293edb171e7;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=0c9475a328d7f19541b400f97ac9d3ff2d9e85d7;hpb=ca08b2bf6b42da4c1ec65e60ffc26384d317a15c;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
index 0c9475a3..009f1416 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
@@ -1,5 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
 JAVAROOT = .
-CLASSPATH_ENV = CLASSPATH=$(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
+AM_JAVACFLAGS = -classpath $(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
 
 pkgpath = org/lttng/ust/agent/log4j
 
@@ -29,7 +31,7 @@ $(jarfile): classnoinst.stamp
 if !HAVE_JAVAH
 # If we don't have javah, assume we are running openjdk >= 10 and use javac
 # to generate the jni header file.
-AM_JAVACFLAGS = -h $(log4jjniout)
+AM_JAVACFLAGS += -h $(log4jjniout)
 else
 log4j-jni-header.stamp: $(dist_noinst_JAVA)
 	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \