merged, thanks! ----- Original Message ----- > From: "David Goulet" <[email protected]> > To: [email protected] > Cc: "mathieu desnoyers" <[email protected]>, "David Goulet" > <[email protected]> > Sent: Tuesday, May 27, 2014 11:03:42 AM > Subject: [PATCH] Fix: out of tree build for lib Java and JUL > > Reported-by: Daniel Olivier <[email protected]> > Signed-off-by: David Goulet <[email protected]> > --- > liblttng-ust-java/Makefile.am | 2 +- > liblttng-ust-jul/Makefile.am | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am > index 64c654b..c66dd79 100644 > --- 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 bc13c76..eb0a5f6 100644 > --- 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 > -- > 2.0.0.rc2 > >
-- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
