From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Mon, 25 Apr 2016 19:52:03 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust] Add missing line continuation and
 fix indentation
In-Reply-To: <1461609980-5025-1-git-send-email-mjeanson@efficios.com>
References: <1461609980-5025-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1777984486.69074.1461613923958.JavaMail.zimbra@efficios.com>

Merged into master and stable-2.8, thanks!

(updated patch title)

Mathieu

----- On Apr 25, 2016, at 2:46 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   | 10 +++++-----
> liblttng-ust-java-agent/jni/log4j/Makefile.am | 10 +++++-----
> 2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am
> b/liblttng-ust-java-agent/jni/jul/Makefile.am
> index 111c559..a94d44e 100644
> --- a/liblttng-ust-java-agent/jni/jul/Makefile.am
> +++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
> @@ -2,12 +2,12 @@ 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 \
> -				  lttng_ust_jul.h
> +	lttng_ust_jul.h
> 
> nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h
> 
> liblttng_ust_jul_jni_la_LIBADD = -lc \
> -								 -L$(top_builddir)/liblttng-ust/.libs \
> -								 -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
> -								 -llttng-ust-context-jni
> -								 -llttng-ust
> +	-L$(top_builddir)/liblttng-ust/.libs \
> +	-L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
> +	-llttng-ust-context-jni \
> +	-llttng-ust
> diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am
> b/liblttng-ust-java-agent/jni/log4j/Makefile.am
> index a94479c..5545631 100644
> --- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
> +++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
> @@ -2,12 +2,12 @@ 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
> +	lttng_ust_log4j.h
> 
> nodist_liblttng_ust_log4j_jni_la_SOURCES =
> org_lttng_ust_agent_log4j_LttngLog4jApi.h
> 
> liblttng_ust_log4j_jni_la_LIBADD = -lc \
> -								   -L$(top_builddir)/liblttng-ust/.libs \
> -								   -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
> -								   -llttng-ust-context-jni
> -								   -llttng-ust
> +	-L$(top_builddir)/liblttng-ust/.libs \
> +	-L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
> +	-llttng-ust-context-jni \
> +	-llttng-ust
> --
> 2.7.4

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