X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=baada571bf8d75ae3219fd362a62fef7e48e9b8b;hb=e9f192202dc026735ef66edb7447bea9c2602f4f;hp=31915d0d479b256fce1d56c613e25c72ecb872c5;hpb=47033aae099a7675bf12c291c7861dc9bcfa4587;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 31915d0d..baada571 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,21 +1,28 @@
-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
 lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = LTTNG_UST.c LTTNG_UST.h lttng_ust_java.h
-dist_noinst_DATA = LTTNG_UST.java
+liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
+nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
+
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTNG_UST.class LTTNG_UST.h
+$(jarfile): classnoinst.stamp
+	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
 
-clean-local:
-	rm -rf LTTNG_UST.h LTTNG_UST.class
+org_lttng_ust_LTTngUst.h: jni-header.stamp
 
-LTTNG_UST.class: LTTNG_UST.java
-	javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java"
+jni-header.stamp: $(dist_noinst_JAVA)
+	$(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+	echo "JNI header generated" > jni-header.stamp
 
-LTTNG_UST.h: LTTNG_UST.class
-	javah -classpath ./ -jni LTTNG_UST
+all-local: org_lttng_ust_LTTngUst.h
 
-endif
+CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h