Fix make dist: fix liblttng-ust-java dependencies

Acked-by: Alexandre Montplaisir <alexandre.montplaisir@polymtl.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-java/LTTngUst.c b/liblttng-ust-java/LTTngUst.c
index 9ae3983050b0095afcde4da886b26aed0798f343..4549fdea8789f1ab73efdc720c8217aa150b6c38 100644 (file)
--- a/liblttng-ust-java/LTTngUst.c
+++ b/liblttng-ust-java/LTTngUst.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <jni.h>
+#include "org_lttng_ust_LTTngUst.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 7e1834a6cc6d1c6cd9b5ba74b8575ff34b324430..4c998dcbba42ac72006d18afc59331b86f848be8 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,7 +3,8 @@ if BUILD_JNI_INTERFACE
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = LTTngUst.c org_lttng_ust_LTTngUst.h lttng_ust_java.h
+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
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
@@ -14,6 +15,8 @@ clean-local:
        rm liblttng-ust-java.jar
        rm -rf org/
 
+LTTngUst.c: org_lttng_ust_LTTngUst.h
+
 LTTngUst.class: LTTngUst.java
        javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"