projects
/
deliverable
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move and hide new 'lttng_ust_counter_create' private symbol
[deliverable/lttng-ust.git]
/
liblttng-ust-java
/
Makefile.am
diff --git
a/liblttng-ust-java/Makefile.am
b/liblttng-ust-java/Makefile.am
index 203a9ffc43335ca827dbe53c444c4305ad1b54f2..dc4bbc68d8938c9b23a270c615d5bfc0bb310efc 100644
(file)
--- a/
liblttng-ust-java/Makefile.am
+++ b/
liblttng-ust-java/Makefile.am
@@
-7,22
+7,33
@@
dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
jar_DATA = $(jarfile)
BUILT_SOURCES = org_lttng_ust_LTTngUst.h
jar_DATA = $(jarfile)
BUILT_SOURCES = org_lttng_ust_LTTngUst.h
-AM_CPPFLAGS
= -I$(top_srcdir)/include
+AM_CPPFLAGS
+= -I$(builddir) -I$(srcdir) $(JNI_CPPFLAGS)
lib_LTLIBRARIES = liblttng-ust-java.la
liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
lib_LTLIBRARIES = liblttng-ust-java.la
liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
-liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
+liblttng_ust_java_la_LIBADD = -lc \
+ $(top_builddir)/liblttng-ust/liblttng-ust.la
$(jarfile): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
$(jarfile): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
+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 .
+
+org_lttng_ust_LTTngUst.h: $(jarfile)
+else
org_lttng_ust_LTTngUst.h: jni-header.stamp
jni-header.stamp: $(dist_noinst_JAVA)
org_lttng_ust_LTTngUst.h: jni-header.stamp
jni-header.stamp: $(dist_noinst_JAVA)
- $(JAVAH) -c
p .
$(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+ $(JAVAH) -c
lasspath $(srcdir)
$(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
echo "JNI header generated" > jni-header.stamp
echo "JNI header generated" > jni-header.stamp
+endif
all-local: org_lttng_ust_LTTngUst.h
all-local: org_lttng_ust_LTTngUst.h
+EXTRA_DIST = README
+
CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h
CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h
This page took
0.025341 seconds
and
5
git commands to generate.