X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2FMakefile.am;h=473e8729bae1a31e8901d275c8f27f2493454fc2;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=87fae408317df930873e5e71590200907ac8836a;hpb=9771833515b675ea6a2bf8ed19518d000495109a;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
index 87fae408..473e8729 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
 JAVAROOT = .
 
 pkgpath = org/lttng/ust/agent
@@ -11,6 +13,7 @@ jardir = $(datadir)/java
 jnioutdir = ../../jni/common
 
 dist_noinst_JAVA = $(pkgpath)/AbstractLttngAgent.java \
+				   $(pkgpath)/EventNamePattern.java \
 				   $(pkgpath)/ILttngAgent.java \
 				   $(pkgpath)/ILttngHandler.java \
 				   $(pkgpath)/LTTngAgent.java \
@@ -49,11 +52,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 $(jnioutdir)
+else
 context-jni-header.stamp: $(dist_noinst_JAVA)
 	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(jnioutdir) $(JAVAHFLAGS) org.lttng.ust.agent.context.LttngContextApi && \
 	echo "Context API JNI header generated" > context-jni-header.stamp
 
 all-local: context-jni-header.stamp
+endif
 
 install-data-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
@@ -61,10 +70,12 @@ install-data-hook:
 uninstall-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(pkgpath)/*.class \
+CLEANFILES = *.jar \
+			 $(pkgpath)/*.class \
 			 $(pkgpath)/client/*.class \
 			 $(pkgpath)/context/*.class \
 			 $(pkgpath)/filter/*.class \
 			 $(pkgpath)/session/*.class \
 			 $(pkgpath)/utils/*.class \
-			 $(juljniout)/org_lttng_ust_agent_context_LttngContextApi.h
+			 context-jni-header.stamp \
+			 $(jnioutdir)/org_lttng_ust_agent_context_LttngContextApi.h