X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=260774f972c81540854b9d20828be9651341f7d2;hb=528a19119f71805f798c034d6ced6836adc0f0c7;hp=57b95323ff9c8ae717c28897d579b59691dbeb74;hpb=996aeadece97a55e7f48ca1e73958a53de62ed4f;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 57b95323..260774f9 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,29 +1,36 @@
-if BUILD_JNI_INTERFACE
+JAVAROOT = .
+jarfile = liblttng-ust-java.jar
+jardir = $(datadir)/java
+pkgpath = org/lttng/ust
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
+jar_DATA = $(jarfile)
+BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
 lib_LTLIBRARIES = liblttng-ust-java.la
 liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
 nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
-dist_noinst_DATA = LTTngUst.java
-liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
+liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-clean-local:
-	rm -f org_lttng_ust_LTTngUst.h
-	rm -f liblttng-ust-java.jar
-	rm -rf org/
+$(jarfile): classnoinst.stamp
+	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
 
-LTTngUst.c: org_lttng_ust_LTTngUst.h
+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 .
 
-LTTngUst.class: LTTngUst.java
-	javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
+org_lttng_ust_LTTngUst.h: $(jarfile)
+else
+org_lttng_ust_LTTngUst.h: jni-header.stamp
 
-org_lttng_ust_LTTngUst.h: LTTngUst.class
-	javah org.lttng.ust.LTTngUst
+jni-header.stamp: $(dist_noinst_JAVA)
+	$(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+	echo "JNI header generated" > jni-header.stamp
+endif
 
-liblttng-ust-java.jar: LTTngUst.class
-	jar cf liblttng-ust-java.jar org/*
+all-local: org_lttng_ust_LTTngUst.h
 
-endif
+CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h