projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build jni libs with openjdk >= 10
[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 c0316e23a65b9ffeaa6d8196cd4121076f156feb..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
@@
-26,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)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \
echo "JUL JNI header generated" > jul-jni-header.stamp
all-local: $(stamp)
jul-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \
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)
@@
-38,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 \
+CLEANFILES = *.jar \
+ $(pkgpath)/*.class \
+ jul-jni-header.stamp \
$(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h
$(juljniout)/org_lttng_ust_agent_jul_LttngJulApi.h
This page took
0.024926 seconds
and
4
git commands to generate.