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

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 31915d0d..37867a7c 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,21 +1,38 @@
+LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
+LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
+
 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 = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTNG_UST.class LTTNG_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 LTTNG_UST.h LTTNG_UST.class
+	rm -f org_lttng_ust_LTTngUst.h
+	rm -f liblttng-ust-java.jar
+	rm -rf org/lttng/ust/*.class
+
+LTTngUst.c: org_lttng_ust_LTTngUst.h
+
+$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/LTTngUst.java
+	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR)/LTTngUst.java"
 
-LTTNG_UST.class: LTTNG_UST.java
-	javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java"
+org_lttng_ust_LTTngUst.h: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/javah org.lttng.ust.LTTngUst
 
-LTTNG_UST.h: LTTNG_UST.class
-	javah -classpath ./ -jni LTTNG_UST
+liblttng-ust-java.jar: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/jar cf liblttng-ust-java.jar $(LTTNG_JUST_DESTDIR)/*.class
 
 endif