Skip to contentSkip to conversation

Add missing line continuation and fix indentation

PATCH Mathieu Desnoyers 1 participant 1 message Apr 25, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged into master and stable-2.8, thanks!

(updated patch title)

Mathieu

Quoted 57 lines · ----- On Apr 25, 2016, at 2:46 PM, Michael Jeanson [email protected] wrote:

---
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(-)
liblttng-ust-java-agent/jni/jul/Makefile.am +0 -1
index 111c559..a94d44e 100644
@@ -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 \

liblttng-ust-java-agent/jni/jul/Makefile.am +1 -1
-				  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 \

liblttng-ust-java-agent/jni/jul/Makefile.am +4 -4
-								 -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
liblttng-ust-java-agent/jni/log4j/Makefile.am +0 -1
index a94479c..5545631 100644
@@ -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 \

liblttng-ust-java-agent/jni/log4j/Makefile.am +1 -1
-				  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 \

liblttng-ust-java-agent/jni/log4j/Makefile.am +4 -5
-								   -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

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev