projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lttng-ust(3): specify "If set" instead of "if set to 1" for some variables
[lttng-ust.git]
/
liblttng-ust-java
/
Makefile.am
diff --git
a/liblttng-ust-java/Makefile.am
b/liblttng-ust-java/Makefile.am
index 9e01e045e34b78ef5c64cd423dccf6a8b83ec32b..399b62cac1d06cb322d3b549c9998523d72027fe 100644
(file)
--- a/
liblttng-ust-java/Makefile.am
+++ b/
liblttng-ust-java/Makefile.am
@@
-1,22
+1,28
@@
-if BUILD_JNI_INTERFACE
+JAVAROOT = .
+jarfile = liblttng-ust-java.jar
+jardir = $(datadir)/java
+pkgpath = org/lttng/ust
-AM_CPPFLAGS = -I$(top_srcdir)/include
+dist_noinst_JAVA = $(pkgpath)/LTTngUst.java
+jar_DATA = $(jarfile)
+BUILT_SOURCES = org_lttng_ust_LTTngUst.h
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
lib_LTLIBRARIES = liblttng-ust-java.la
lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = LTTngUst.c org_lttng_ust_LTTngUst.h lttng_ust_java.h
-dist_noinst_DATA = LTTngUst.java
+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 -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-all: LTTngUst.class org_lttng_ust_LTTngUst.h
+$(jarfile): classnoinst.stamp
+ $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
-clean-local:
- rm org_lttng_ust_LTTngUst.h
- rm -rf org/
+org_lttng_ust_LTTngUst.h: jni-header.stamp
-LTTngUst.class: LTTngUst.java
- javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
+jni-header.stamp: $(dist_noinst_JAVA)
+ $(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
+ echo "JNI header generated" > jni-header.stamp
-org_lttng_ust_LTTngUst.h: LTTngUst.class
- javah org.lttng.ust.LTTngUst
+all-local: org_lttng_ust_LTTngUst.h
-endif
+CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h
This page took
0.023877 seconds
and
4
git commands to generate.