X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=37867a7cdf45b115e1ec131b2ebbf47f4ac45817;hb=f02baefb3ba4d5493816d63f65625ba4269224d2;hp=57b95323ff9c8ae717c28897d579b59691dbeb74;hpb=996aeadece97a55e7f48ca1e73958a53de62ed4f;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 57b95323..37867a7c 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,3 +1,6 @@
+LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
+LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
+
 if BUILD_JNI_INTERFACE
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
@@ -5,25 +8,31 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 lib_LTLIBRARIES = liblttng-ust-java.la
 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
+dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
+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 -f org_lttng_ust_LTTngUst.h
 	rm -f liblttng-ust-java.jar
-	rm -rf org/
+	rm -rf org/lttng/ust/*.class
 
 LTTngUst.c: org_lttng_ust_LTTngUst.h
 
-LTTngUst.class: LTTngUst.java
-	javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
+$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/LTTngUst.java
+	$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR)/LTTngUst.java"
 
-org_lttng_ust_LTTngUst.h: LTTngUst.class
-	javah org.lttng.ust.LTTngUst
+org_lttng_ust_LTTngUst.h: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/javah org.lttng.ust.LTTngUst
 
-liblttng-ust-java.jar: LTTngUst.class
-	jar cf liblttng-ust-java.jar org/*
+liblttng-ust-java.jar: $(LTTNG_JUST_DESTDIR)/LTTngUst.class
+	$(JCC)/jar cf liblttng-ust-java.jar $(LTTNG_JUST_DESTDIR)/*.class
 
 endif