1 --- lttng-ust-2.4.0/liblttng-ust/Makefile.am.orig 2014-02-28 19:20:10.000000000 +0100
2 +++ lttng-ust-2.4.0/liblttng-ust/Makefile.am 2014-03-03 10:55:00.270969760 +0100
4 $(top_builddir)/libringbuffer/libringbuffer.la
6 liblttng_ust_la_LIBADD = \
11 --- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-26 21:09:30.334240517 +0100
12 +++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am 2015-01-26 21:11:19.994235912 +0100
14 liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
15 nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
17 -liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
18 +liblttng_ust_java_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
20 $(jarfile): classnoinst.stamp
21 $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
22 --- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am.orig 2015-01-26 20:39:58.000000000 +0100
23 +++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am 2015-01-26 21:17:08.297554669 +0100
26 nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LTTngLogHandler.h
28 -liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
29 +liblttng_ust_jul_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
30 --- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig 2015-01-26 20:39:58.000000000 +0100
31 +++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am 2015-01-26 21:17:37.837553389 +0100
34 nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LTTngLogAppender.h
36 -liblttng_ust_log4j_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
37 +liblttng_ust_log4j_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la