projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: coverity reported null returns in Log4j2 agent
[lttng-ust.git]
/
liblttng-ust-java-agent
/
java
/
lttng-ust-agent-jul
/
Makefile.am
diff --git
a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
b/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
index b2aed8b467d0d91e8f764597a8a96340e8485963..99fa78cf51e469b0395b499f0b45c0a1efbc5de7 100644
(file)
--- a/
liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
+++ b/
liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am
@@
-12,8
+12,9
@@
jardir = $(datadir)/java
juljniout = ../../jni/jul
juljniout = ../../jni/jul
-dist_noinst_JAVA = $(pkgpath)/LTTngJUL.java \
- $(pkgpath)/LTTngLogHandler.java
+dist_noinst_JAVA = $(pkgpath)/LttngJulAgent.java \
+ $(pkgpath)/LttngJulApi.java \
+ $(pkgpath)/LttngLogHandler.java
dist_noinst_DATA = $(jarfile_manifest)
dist_noinst_DATA = $(jarfile_manifest)
@@
-25,11
+26,17
@@
classes = $(pkgpath)/*.class
$(jarfile): classnoinst.stamp
$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
$(jarfile): classnoinst.stamp
$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
+if !HAVE_JAVAH
+# If we don't have javah, assume we are running openjdk >= 10 and use javac
+# to generate the jni header file.
+AM_JAVACFLAGS = -h $(juljniout)
+else
jul-jni-header.stamp: $(dist_noinst_JAVA)
jul-jni-header.stamp: $(dist_noinst_JAVA)
- $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.L
TTngLogHandler
&& \
+ $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.L
ttngJulApi
&& \
echo "JUL JNI header generated" > jul-jni-header.stamp
all-local: $(stamp)
echo "JUL JNI header generated" > jul-jni-header.stamp
all-local: $(stamp)
+endif
install-data-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
install-data-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)
@@
-37,5
+44,7
@@
install-data-hook:
uninstall-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
uninstall-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
-CLEANFILES = $(jarfile) $(pkgpath)/*.class jul-jni-header.stamp \
- $(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h
+CLEANFILES = *.jar \
+ $(pkgpath)/*.class \
+ jul-jni-header.stamp \
+ $(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h
This page took
0.023744 seconds
and
4
git commands to generate.