X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java%2FMakefile.am;h=399b62cac1d06cb322d3b549c9998523d72027fe;hb=a58e9bc0f13395c5df6f9be3c93a555574c630cd;hp=203a9ffc43335ca827dbe53c444c4305ad1b54f2;hpb=8d17995998aa11ffeecbe2cf7701106283544253;p=lttng-ust.git

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 203a9ffc..399b62ca 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -7,7 +7,7 @@ dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
 jar_DATA = $(jarfile)
 BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
 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
@@ -20,7 +20,7 @@ $(jarfile): classnoinst.stamp
 org_lttng_ust_LTTngUst.h: jni-header.stamp
 
 jni-header.stamp: $(dist_noinst_JAVA)
-	$(JAVAH) -cp . $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+	$(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
 	echo "JNI header generated" > jni-header.stamp
 
 all-local: org_lttng_ust_LTTngUst.h