X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2FMakefile.am;h=63e604c5e79da0d52cad3da7931c5f68c8770f5d;hb=7f6639c208fdea0b21476c24577d4286bf2aa80a;hp=7d6c0481a0997629587a9183299560b5b32972e7;hpb=db3487fd0d63a6fdba09f95b40cfff5937901b77;p=lttng-tools.git diff --git a/tests/regression/ust/java-log4j/Makefile.am b/tests/regression/ust/java-log4j/Makefile.am index 7d6c0481a..63e604c5e 100644 --- a/tests/regression/ust/java-log4j/Makefile.am +++ b/tests/regression/ust/java-log4j/Makefile.am @@ -1,24 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only -noinst_SCRIPTS = test_java_log4j JTestLTTng.java -EXTRA_DIST = test_java_log4j JTestLTTng.java +JAVAROOT = . -if HAVE_JAVA_JDK -JCC=$(JAVA_JDK)/bin/javac -else -JCC=javac -endif +noinst_SCRIPTS = test_java_log4j JTestLTTngLog4j.java +EXTRA_DIST = test_java_log4j JTestLTTngLog4j.java -# 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 +if TEST_JAVA_LOG4J_AGENT +dist_noinst_JAVA = JTestLTTngLog4j.java +endif # TEST_JAVA_LOG4J_AGENT -%.class: %.java - $(JCC) -d "$(builddir)" $(JAVACFLAGS) $< -else all-local: static_file -endif # BUILD_JAVA_LOG4J_AGENT - -JTestLTTng.class: JTestLTTng.java static_file: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \