projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libtool syntax in LDADD
[lttng-ust.git]
/
liblttng-ust-java-agent
/
jni
/
log4j
/
Makefile.am
diff --git
a/liblttng-ust-java-agent/jni/log4j/Makefile.am
b/liblttng-ust-java-agent/jni/log4j/Makefile.am
index b734bf3dfa25ceb3acee7e6a5d3d69af1c7b7b04..188597d24a9e936c4af217823f4d48ab669e6107 100644
(file)
--- a/
liblttng-ust-java-agent/jni/log4j/Makefile.am
+++ b/
liblttng-ust-java-agent/jni/log4j/Makefile.am
@@
-1,8
+1,11
@@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
+
lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
-
lttng_ust_log4j.h
+ lttng_ust_log4j.h
-nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_L
TTngLogAppender
.h
+nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_L
ttngLog4jApi
.h
-liblttng_ust_log4j_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
+liblttng_ust_log4j_jni_la_LIBADD = -lc \
+ $(top_builddir)/liblttng-ust/liblttng-ust.la \
+ $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la
This page took
0.023077 seconds
and
4
git commands to generate.