X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=java%2FMakefile.am;h=cb2c1b8931f2cef8a399857b32e13104bc489349;hb=2b6f8df951cb74149a9ab9c5146e6dd8498b9e87;hp=fa536287827edd13db88a8bc8d0209309a92ba7e;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=lttng-ust.git

diff --git a/java/Makefile.am b/java/Makefile.am
index fa536287..cb2c1b89 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,15 +1,21 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libust
+if BUILD_JNI_INTERFACE
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libustjava.la
-libustjava_la_SOURCES = UST.c UST.h
-noinst_DATA = UST.java
+libustjava_la_SOURCES = UST.c UST.h ust_java.h
+dist_noinst_DATA = UST.java
 libustjava_la_LIBADD = -lc -L$(top_builddir)/libust/.libs -lust
 
-all: UST.class
+all: UST.class UST.h
 
 clean-local:
 	rm -rf UST.h UST.class
 
 UST.class: UST.java
-	javac UST.java
+	javac -d "$(builddir)" "$(srcdir)/UST.java"
+
+UST.h: UST.class
+	javah -jni UST
 
+endif