From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Thu, 25 Jun 2015 23:19:49 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust] Fix: out of tree build of java
	agents
In-Reply-To: <1435273854-19722-1-git-send-email-mjeanson@efficios.com>
References: <1435273854-19722-1-git-send-email-mjeanson@efficios.com>
Message-ID: <420624310.3691.1435274389914.JavaMail.zimbra@efficios.com>

merged in master and stable-2.6, thanks!

Mathieu

----- On Jun 25, 2015, at 7:10 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> liblttng-ust-java-agent/jni/jul/Makefile.am   | 2 +-
> liblttng-ust-java-agent/jni/log4j/Makefile.am | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am
> b/liblttng-ust-java-agent/jni/jul/Makefile.am
> index 6c9dc28..d0d6d78 100644
> --- a/liblttng-ust-java-agent/jni/jul/Makefile.am
> +++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include
> +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> 
> lib_LTLIBRARIES = liblttng-ust-jul-jni.la
> liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
> diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am
> b/liblttng-ust-java-agent/jni/log4j/Makefile.am
> index b734bf3..7acbccd 100644
> --- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
> +++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
> @@ -1,4 +1,4 @@
> -AM_CPPFLAGS = -I$(top_srcdir)/include
> +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
> lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
> liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
> 				  lttng_ust_log4j.h
> --
> 1.9.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com