projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move to kernel style SPDX license identifiers
[lttng-ust.git]
/
liblttng-ust-java-agent
/
java
/
lttng-ust-agent-log4j
/
Makefile.am
diff --git
a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
index 05a18d436a2029317ea7034bf6fd08e3761cb586..009f14167e6285d8a245a933ec0b7293edb171e7 100644
(file)
--- a/
liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
+++ b/
liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
@@
-1,5
+1,7
@@
+# SPDX-License-Identifier: LGPL-2.1-only
+
JAVAROOT = .
JAVAROOT = .
-
CLASSPATH_ENV = CLASSPATH=
$(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
+
AM_JAVACFLAGS = -classpath
$(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
pkgpath = org/lttng/ust/agent/log4j
pkgpath = org/lttng/ust/agent/log4j
@@
-26,11
+28,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 $(log4jjniout)
+else
log4j-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \
echo "Log4j JNI header generated" > log4j-jni-header.stamp
all-local: $(stamp)
log4j-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \
echo "Log4j JNI header generated" > log4j-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)
This page took
0.024695 seconds
and
4
git commands to generate.