X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-jul%2FMakefile.am;h=e5fb8a69e2e5f67b89151a79fb1ad7068f8eed3d;hb=0f6f0e89dace3a34dae3e06e5af0515a49149acd;hp=99fa78cf51e469b0395b499f0b45c0a1efbc5de7;hpb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
index 99fa78cf..e5fb8a69 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
@@ -1,5 +1,5 @@
 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/jul
 
@@ -29,7 +29,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 $(juljniout)
+AM_JAVACFLAGS += -h $(juljniout)
 else
 jul-jni-header.stamp: $(dist_noinst_JAVA)
 	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \