projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: compile doc/ after JUL/Java
[lttng-ust.git]
/
liblttng-ust-java
/
Makefile.am
diff --git
a/liblttng-ust-java/Makefile.am
b/liblttng-ust-java/Makefile.am
index 7e1834a6cc6d1c6cd9b5ba74b8575ff34b324430..37867a7cdf45b115e1ec131b2ebbf47f4ac45817 100644
(file)
--- a/
liblttng-ust-java/Makefile.am
+++ b/
liblttng-ust-java/Makefile.am
@@
-1,26
+1,38
@@
+LTTNG_JUST_SRCDIR = $(srcdir)/org/lttng/ust
+LTTNG_JUST_DESTDIR = $(builddir)/org/lttng/ust
+
if BUILD_JNI_INTERFACE
AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = liblttng-ust-java.la
if BUILD_JNI_INTERFACE
AM_CPPFLAGS = -I$(top_srcdir)/include
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
+dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
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 liblttng-ust-java.jar
+if HAVE_JAVA_JDK
+JCC=$(JAVA_JDK)/bin
+else
+JCC=javac
+endif
+
+all: $(LTTNG_JUST_DESTDIR)/LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
clean-local:
clean-local:
- rm org_lttng_ust_LTTngUst.h
- rm liblttng-ust-java.jar
- rm -rf org/
+ rm -f org_lttng_ust_LTTngUst.h
+ rm -f liblttng-ust-java.jar
+ rm -rf org/lttng/ust/*.class
+
+LTTngUst.c: org_lttng_ust_LTTngUst.h
-
LTTngUst.class:
LTTngUst.java
-
javac -d "$(builddir)" "$(srcdir
)/LTTngUst.java"
+
$(LTTNG_JUST_DESTDIR)/LTTngUst.class: $(LTTNG_JUST_SRCDIR)/
LTTngUst.java
+
$(JCC)/javac -d "$(builddir)" "$(LTTNG_JUST_SRCDIR
)/LTTngUst.java"
-org_lttng_ust_LTTngUst.h: LTTngUst.class
- javah org.lttng.ust.LTTngUst
+org_lttng_ust_LTTngUst.h:
$(LTTNG_JUST_DESTDIR)/
LTTngUst.class
+
$(JCC)/
javah org.lttng.ust.LTTngUst
-liblttng-ust-java.jar: LTTngUst.class
- jar cf liblttng-ust-java.jar org/*
+liblttng-ust-java.jar:
$(LTTNG_JUST_DESTDIR)/
LTTngUst.class
+ $(JCC)/jar cf liblttng-ust-java.jar $(LTTNG_JUST_DESTDIR)/*.class
endif
endif
This page took
0.023888 seconds
and
4
git commands to generate.