projects / packages / lttng-ust.git / blame
| Commit | Line | Data |
|---|---|---|
| 567ef3fb JB |
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 | |
| 3 | @@ -67,6 +67,7 @@ | |
| 4 | $(top_builddir)/libringbuffer/libringbuffer.la | |
| 5 | ||
| 6 | liblttng_ust_la_LIBADD = \ | |
| 7 | + -ldl \ | |
| 8 | -lpthread \ | |
| 9 | -lrt \ | |
| 10 | -lurcu-cds \ | |
| 5afbdfe9 JB |
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 | |
| 13 | @@ -12,7 +12,7 @@ | |
| 14 | liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h | |
| 15 | nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h | |
| 16 | ||
| 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 | |
| 19 | ||
| 20 | $(jarfile): classnoinst.stamp | |
| 21 | $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class | |
| 7f99f27e JB |
22 | --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am.orig 2016-06-25 12:12:34.117486360 +0200 |
| 23 | +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am 2016-06-25 12:14:28.320201004 +0200 | |
| 24 | @@ -7,7 +7,5 @@ | |
| 25 | nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h | |
| 5afbdfe9 | 26 | |
| 7f99f27e JB |
27 | liblttng_ust_jul_jni_la_LIBADD = -lc \ |
| 28 | - -L$(top_builddir)/liblttng-ust/.libs \ | |
| 29 | - -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \ | |
| 30 | - -llttng-ust-context-jni \ | |
| 31 | - -llttng-ust | |
| 32 | + $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \ | |
| 33 | + $(top_builddir)/liblttng-ust/liblttng-ust.la | |
| 34 | --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig 2016-06-25 12:12:34.117486360 +0200 | |
| 35 | +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am 2016-06-25 12:15:29.779868049 +0200 | |
| 36 | @@ -7,7 +7,5 @@ | |
| 37 | nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h | |
| 5afbdfe9 | 38 | |
| 7f99f27e JB |
39 | liblttng_ust_log4j_jni_la_LIBADD = -lc \ |
| 40 | - -L$(top_builddir)/liblttng-ust/.libs \ | |
| 41 | - -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \ | |
| 42 | - -llttng-ust-context-jni \ | |
| 43 | - -llttng-ust | |
| 44 | + $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \ | |
| 45 | + $(top_builddir)/liblttng-ust/liblttng-ust.la | |
| 46 | --- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am.orig 2016-05-31 06:38:27.000000000 +0200 | |
| 47 | +++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am 2016-06-25 12:15:51.336417933 +0200 | |
| 5afbdfe9 | 48 | @@ -5,4 +5,4 @@ |
| 567ef3fb | 49 | |
| 7f99f27e | 50 | nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h |
| b209f2a8 | 51 | |
| 7f99f27e JB |
52 | -liblttng_ust_context_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust |
| 53 | +liblttng_ust_context_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la | |
| 54 | --- lttng-ust-2.8.1/liblttng-ust-python-agent/Makefile.am.orig 2016-06-25 12:16:24.649570794 +0200 | |
| 55 | +++ lttng-ust-2.8.1/liblttng-ust-python-agent/Makefile.am 2016-06-25 12:19:01.568720691 +0200 | |
| 56 | @@ -4,5 +4,5 @@ | |
| 57 | AM_CFLAGS = -fno-strict-aliasing | |
| 58 | lib_LTLIBRARIES = liblttng-ust-python-agent.la | |
| 59 | liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h | |
| 60 | -liblttng_ust_python_agent_la_LIBADD = -lc -llttng-ust \ | |
| 61 | - -L$(top_builddir)/liblttng-ust/.libs | |
| 62 | +liblttng_ust_python_agent_la_LIBADD = -lc \ | |
| 63 | + $(top_builddir)/liblttng-ust/liblttng-ust.la |