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=9ae532330b74093a18e8d60691f122352a69328f;hpb=d60dfbe48a0ceff16852f46419bcbc405502c61d;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 9ae53233..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
 
@@ -13,6 +15,7 @@ jardir = $(datadir)/java
 log4jjniout = ../../jni/log4j
 
 dist_noinst_JAVA = $(pkgpath)/LttngLog4jAgent.java \
+				   $(pkgpath)/LttngLog4jApi.java \
 				   $(pkgpath)/LttngLogAppender.java
 
 dist_noinst_DATA = $(jarfile_manifest)
@@ -25,11 +28,17 @@ classes = $(pkgpath)/*.class
 $(jarfile): classnoinst.stamp
 	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
 
+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)
+else
 log4j-jni-header.stamp: $(dist_noinst_JAVA)
-	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLogAppender && \
+	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \
 	echo "Log4j JNI header generated" > log4j-jni-header.stamp
 
 all-local: $(stamp)
+endif
 
 install-data-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
@@ -37,5 +46,7 @@ install-data-hook:
 uninstall-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class log4j-jni-header.stamp \
-	$(log4jjniout)/org_lttng_ust_agent_log4j_LttngLogAppender.h
+CLEANFILES = *.jar \
+	$(pkgpath)/*.class \
+	log4j-jni-header.stamp \
+	$(log4jjniout)/org_lttng_ust_agent_log4j_LttngLog4jApi.h