Fix: out of tree build for lib Java and JUL

Reported-by: Daniel Olivier <daniel.olivier@ericsson.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 64c654bb5a07c29e811f7efea6f97d20d641c110..c66dd79c32b17d408ff481b4d1bea5cc527ab648 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,7 +3,7 @@ LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
 
 if BUILD_JNI_INTERFACE
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)
+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

diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am
index bc13c76f8ba8bf212e104aa5207e0305ac51e607..eb0a5f60694fcb0660b395bbf2af28d368b9726d 100644 (file)
--- a/liblttng-ust-jul/Makefile.am
+++ b/liblttng-ust-jul/Makefile.am
@@ -3,7 +3,7 @@ LTTNG_JUL_DESTDIR = $(builddir)/org/lttng/ust/jul
 
 if BUILD_JNI_INTERFACE
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(builddir) -I$(top_builddir)/include
 
 BUILT_SOURCES = org_lttng_ust_jul_LTTngUst.h
 lib_LTLIBRARIES = liblttng-ust-jul-jni.la