1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
Description: Fix incompatible java bytecode format
Author: Michael Jeanson <mjeanson@ubuntu.com>
Forwarded: not-needed
--- a/src/lib/lttng-ust-java/Makefile.am
+++ b/src/lib/lttng-ust-java/Makefile.am
@@ -12,7 +12,8 @@
AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
-lib_LTLIBRARIES = liblttng-ust-java.la
+jnilib_LTLIBRARIES = liblttng-ust-java.la
+jnilibdir = $(libdir)/jni
liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
# Generated by javac / javah
--- a/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am
+++ b/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am
@@ -4,7 +4,8 @@
AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
-lib_LTLIBRARIES = liblttng-ust-jul-jni.la
+jnilib_LTLIBRARIES = liblttng-ust-jul-jni.la
+jnilibdir = $(libdir)/jni
liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
lttng_ust_jul.h
--- a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am
@@ -4,7 +4,8 @@
AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
-lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
+jnilib_LTLIBRARIES = liblttng-ust-log4j-jni.la
+jnilibdir = $(libdir)/jni
liblttng_ust_log4j_jni_la_SOURCES = \
lttng_ust_log4j2_tp.c \
lttng_ust_log4j2_tp.h \
--- a/src/lib/lttng-ust-java-agent/jni/common/Makefile.am
+++ b/src/lib/lttng-ust-java-agent/jni/common/Makefile.am
@@ -4,7 +4,8 @@
AM_CPPFLAGS += -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
-lib_LTLIBRARIES = liblttng-ust-context-jni.la
+jnilib_LTLIBRARIES = liblttng-ust-context-jni.la
+jnilibdir = $(libdir)/jni
liblttng_ust_context_jni_la_SOURCES = lttng_ust_context.c lttng_ust_context.h
nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h
|
