X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2FMakefile.am;h=60d5c37f076d592ee54813cfe536e4f1d0ef62ca;hp=7035ecf929feaad9da4d51d61ddbe21ca6c91ae2;hb=839a956943bd1348dc34372d40c8665705667644;hpb=504d4ace8d2c38787fe40b7e74cbb932cb7f3d89 diff --git a/tests/regression/ust/java-log4j/Makefile.am b/tests/regression/ust/java-log4j/Makefile.am index 7035ecf92..60d5c37f0 100644 --- a/tests/regression/ust/java-log4j/Makefile.am +++ b/tests/regression/ust/java-log4j/Makefile.am @@ -1,22 +1,15 @@ -if BUILD_JAVA_LOG4J_AGENT +JAVAROOT = . 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 -all-local: JTestLTTng.class +all-local: static_file -%.class: %.java - $(JCC) -d "$(builddir)" $(JAVACFLAGS) $< - -JTestLTTng.class: JTestLTTng.java - -all-local: +static_file: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ for script in $(EXTRA_DIST); do \ cp -f $(srcdir)/$$script $(builddir); \ @@ -31,4 +24,3 @@ clean-local: done; \ fi -endif # BUILD_JAVA_LOG4J_AGENT