Merged into master, 2.9, 2.8, 2.7, thanks! Mathieu
----- On Oct 14, 2016, at 10:45 PM, Michael Jeanson mjean...@efficios.com wrote: > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > liblttng-ust-java/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am > index baada57..0c2f6a5 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 > 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 > -- > 2.7.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
