X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=64c654bb5a07c29e811f7efea6f97d20d641c110;hb=051770e1869c87be34e226aef8cc38eb95b8e466;hp=fb25cb7bde49062698126cfe54c0ad76724787e5;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index fb25cb7b..64c654bb 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,21 +1,37 @@
+LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
+LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
+
 if BUILD_JNI_INTERFACE
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)
 
+BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = UST.c UST.h ust_java.h
-dist_noinst_DATA = 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 = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: UST.class UST.h
+if HAVE_JAVA_JDK
+JCC=$(JAVA_JDK)/bin
+else
+JCC=javac
+endif
+
+all: $(LTTNG_JUST_DESTDIR)/LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
 
 clean-local:
-	rm -rf UST.h UST.class
+	rm -f org_lttng_ust_LTTngUst.h
+	rm -f liblttng-ust-java.jar
+	rm -rf org/lttng/ust/*.class
+
+$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/LTTngUst.java
+	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR)/LTTngUst.java"
 
-UST.class: UST.java
-	javac -d "$(builddir)" "$(srcdir)/UST.java"
+org_lttng_ust_LTTngUst.h: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/javah org.lttng.ust.LTTngUst
 
-UST.h: UST.class
-	javah -jni UST
+liblttng-ust-java.jar: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/jar cf liblttng-ust-java.jar $(LTTNG_JUST_DESTDIR)/*.class
 
 endif