Version 2.5.7

[lttng-ust.git] / liblttng-ust-java / Makefile.am

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 4c998dcbba42ac72006d18afc59331b86f848be8..c66dd79c32b17d408ff481b4d1bea5cc527ab648 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,29 +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) -I$(top_builddir)/include
 
+BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 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 org_lttng_ust_LTTngUst.h
-       rm liblttng-ust-java.jar
-       rm -rf org/
-
-LTTngUst.c: org_lttng_ust_LTTngUst.h
+       rm -f org_lttng_ust_LTTngUst.h
+       rm -f liblttng-ust-java.jar
+       rm -rf org/lttng/ust/*.class
 
-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