X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=4c998dcbba42ac72006d18afc59331b86f848be8;hb=3d39c98ccb2a2ce9009c0442e88e15da13219cb3;hp=b94e72ee02b67b08e0f7b560399a0fc2f429d795;hpb=114ca2c433903d7c5edc8e1f4ddae47b650ba079;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index b94e72ee..4c998dcb 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,19 +3,27 @@ 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 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: 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.c: org_lttng_ust_LTTngUst.h
 
-LTTNG_UST.h: LTTNG_UST.class
-	javah -jni LTTNG_UST.class
+LTTngUst.class: LTTngUst.java
+	javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
+
+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