projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: standardise include path
[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 40906e10ca0b191712a7bcf8da9c612acccfa31d..bba128446db184321fc7936e97ee624c694bca11 100644
(file)
--- a/
liblttng-ust-java-agent/jni/jul/Makefile.am
+++ b/
liblttng-ust-java-agent/jni/jul/Makefile.am
@@
-1,9
+1,11
@@
-AM_CPPFLAGS
= -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS
+= -I$(builddir) -I$(srcdir) $(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_Lttng
LogHandler
.h
+nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_Lttng
JulApi
.h
-liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
+liblttng_ust_jul_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.023515 seconds
and
4
git commands to generate.