projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[lttng-ust.git]
/
liblttng-ust-java-agent
/
jni
/
jul
/
Makefile.am
diff --git
a/liblttng-ust-java-agent/jni/jul/Makefile.am
b/liblttng-ust-java-agent/jni/jul/Makefile.am
index 6c9dc287a04caa66de5464c557ffa95812852a79..45bc1b5647040620434dab4a307fc9c79366cd9a 100644
(file)
--- a/
liblttng-ust-java-agent/jni/jul/Makefile.am
+++ b/
liblttng-ust-java-agent/jni/jul/Makefile.am
@@
-1,9
+1,13
@@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
-I$(top_builddir)/include $(JNI_CPPFLAGS)
lib_LTLIBRARIES = liblttng-ust-jul-jni.la
liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
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_L
TTngLogHandler
.h
+nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_L
ttngJulApi
.h
-liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
+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
This page took
0.023078 seconds
and
4
git commands to generate.