From ca7bd68c5510cffbbb282d53eff2332d31429795 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 10 Sep 2012 17:09:20 -0400 Subject: [PATCH] Fix make dist: fix liblttng-ust-java dependencies Acked-by: Alexandre Montplaisir Signed-off-by: Mathieu Desnoyers --- liblttng-ust-java/LTTngUst.c | 2 +- liblttng-ust-java/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/liblttng-ust-java/LTTngUst.c b/liblttng-ust-java/LTTngUst.c index 9ae39830..4549fdea 100644 --- 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 +#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 7e1834a6..4c998dcb 100644 --- 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" -- 2.34.1