projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use compiler-agnostic defines to silence warning
[lttng-tools.git]
/
tests
/
regression
/
ust
/
java-jul
/
Makefile.am
diff --git
a/tests/regression/ust/java-jul/Makefile.am
b/tests/regression/ust/java-jul/Makefile.am
index 286e3df2293611f2888cbd8603529de6c5eea937..5748c7ce1c73d5126dc9ce45d2d7a2236fbeb5eb 100644
(file)
--- a/
tests/regression/ust/java-jul/Makefile.am
+++ b/
tests/regression/ust/java-jul/Makefile.am
@@
-1,25
+1,15
@@
+# SPDX-License-Identifier: GPL-2.0-only
+
+JAVAROOT = .
noinst_SCRIPTS = test_java_jul JTestLTTng.java
EXTRA_DIST = test_java_jul JTestLTTng.java
noinst_SCRIPTS = test_java_jul JTestLTTng.java
EXTRA_DIST = test_java_jul JTestLTTng.java
-if HAVE_JAVA_JDK
-JCC=$(JAVA_JDK)/bin/javac
-else
-JCC=javac
-endif
-
-AGENT_JAR_FILE=$(java_agent_jar_path)
-
+if TEST_JAVA_JUL_AGENT
+dist_noinst_JAVA = JTestLTTng.java
+endif # TEST_JAVA_JUL_AGENT
-# Still need to copy test files in case of out of tree build
-if BUILD_JAVA_AGENT
-all-local: static_file JTestLTTng.class
-%.class: %.java
- $(JCC) -d "$(builddir)" -cp "$(AGENT_JAR_FILE):." $<
-else
all-local: static_file
all-local: static_file
-endif # BUILD_JAVA_AGENT
-
static_file:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
static_file:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
@@
-28,7
+18,6
@@
static_file:
done; \
fi
done; \
fi
-
clean-local:
rm -f *.class
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
clean-local:
rm -f *.class
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
This page took
0.024939 seconds
and
4
git commands to generate.