* [lttng-dev] [PATCH lttng-ust] Add missing line continuation and fix indentation
@ 2016-04-25 18:46 Michael Jeanson
2016-04-25 19:52 ` Mathieu Desnoyers
0 siblings, 1 reply; 2+ messages in thread
From: Michael Jeanson @ 2016-04-25 18:46 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [lttng-dev] [PATCH lttng-ust] Add missing line continuation and fix indentation
2016-04-25 18:46 [lttng-dev] [PATCH lttng-ust] Add missing line continuation and fix indentation Michael Jeanson
@ 2016-04-25 19:52 ` Mathieu Desnoyers
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2016-04-25 19:52 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-25 19:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-25 18:46 [lttng-dev] [PATCH lttng-ust] Add missing line continuation and fix indentation Michael Jeanson
2016-04-25 19:52 ` Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox