projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: check for lttng-modules presence
[lttng-tools.git]
/
tests
/
regression
/
ust
/
java-log4j
/
Makefile.am
diff --git
a/tests/regression/ust/java-log4j/Makefile.am
b/tests/regression/ust/java-log4j/Makefile.am
index 7d6c0481a0997629587a9183299560b5b32972e7..60d5c37f076d592ee54813cfe536e4f1d0ef62ca 100644
(file)
--- a/
tests/regression/ust/java-log4j/Makefile.am
+++ b/
tests/regression/ust/java-log4j/Makefile.am
@@
-1,24
+1,13
@@
+JAVAROOT = .
noinst_SCRIPTS = test_java_log4j JTestLTTng.java
EXTRA_DIST = test_java_log4j JTestLTTng.java
noinst_SCRIPTS = test_java_log4j JTestLTTng.java
EXTRA_DIST = test_java_log4j JTestLTTng.java
-if HAVE_JAVA_JDK
-JCC=$(JAVA_JDK)/bin/javac
-else
-JCC=javac
-endif
+if TEST_JAVA_LOG4J_AGENT
+dist_noinst_JAVA = JTestLTTng.java
+endif # TEST_JAVA_LOG4J_AGENT
-# We still need to copy static files for out of tree and dist build
-if BUILD_JAVA_LOG4J_AGENT
-all-local: static_file JTestLTTng.class
-
-%.class: %.java
- $(JCC) -d "$(builddir)" $(JAVACFLAGS) $<
-else
all-local: static_file
all-local: static_file
-endif # BUILD_JAVA_LOG4J_AGENT
-
-JTestLTTng.class: JTestLTTng.java
static_file:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
static_file:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
This page took
0.023537 seconds
and
4
git commands to generate.