X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=7e1834a6cc6d1c6cd9b5ba74b8575ff34b324430;hb=6dcf3689333a2b465a5738c840d0b14d3f8014ea;hp=d80343a62f6fa83ac25e08c6264bed1cee40a10a;hpb=2ac851987b0cd66f9b566da2a1854fa309c3bbd0;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index d80343a6..7e1834a6 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,19 +3,24 @@ if BUILD_JNI_INTERFACE
 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 org_lttng_ust_LTTngUst.h lttng_ust_java.h
+dist_noinst_DATA = LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTNG_UST.class LTTNG_UST.h
+all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
 
 clean-local:
-	rm -rf LTTNG_UST.h LTTNG_UST.class
+	rm org_lttng_ust_LTTngUst.h
+	rm liblttng-ust-java.jar
+	rm -rf org/
 
-LTTNG_UST.class: LTTNG_UST.java
-	javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java"
+LTTngUst.class: LTTngUst.java
+	javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
 
-LTTNG_UST.h: LTTNG_UST.class
-	javah -jni LTTNG_UST
+org_lttng_ust_LTTngUst.h: LTTngUst.class
+	javah org.lttng.ust.LTTngUst
+
+liblttng-ust-java.jar: LTTngUst.class
+	jar cf liblttng-ust-java.jar org/*
 
 endif