X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-jul%2FMakefile.am;h=99fa78cf51e469b0395b499f0b45c0a1efbc5de7;hb=ca08b2bf6b42da4c1ec65e60ffc26384d317a15c;hp=d32e1d69ffd9dad593def6ee5497edf82ac5daac;hpb=d60dfbe48a0ceff16852f46419bcbc405502c61d;p=lttng-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 d32e1d69..99fa78cf 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
@@ -13,6 +13,7 @@ jardir = $(datadir)/java
 juljniout = ../../jni/jul
 
 dist_noinst_JAVA = $(pkgpath)/LttngJulAgent.java \
+				   $(pkgpath)/LttngJulApi.java \
 				   $(pkgpath)/LttngLogHandler.java
 
 dist_noinst_DATA = $(jarfile_manifest)
@@ -25,11 +26,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 $(juljniout)
+else
 jul-jni-header.stamp: $(dist_noinst_JAVA)
-	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngLogHandler && \
+	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \
 	echo "JUL JNI header generated" > jul-jni-header.stamp
 
 all-local: $(stamp)
+endif
 
 install-data-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
@@ -37,5 +44,7 @@ install-data-hook:
 uninstall-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class jul-jni-header.stamp \
-	$(juljniout)/org_lttng_ust_agent_jul_LttngLogHandler.h
+CLEANFILES = *.jar \
+	$(pkgpath)/*.class \
+	jul-jni-header.stamp \
+	$(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h