X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2FMakefile.am;h=60d5c37f076d592ee54813cfe536e4f1d0ef62ca;hp=7d6c0481a0997629587a9183299560b5b32972e7;hb=839a956943bd1348dc34372d40c8665705667644;hpb=db3487fd0d63a6fdba09f95b40cfff5937901b77 diff --git a/tests/regression/ust/java-log4j/Makefile.am b/tests/regression/ust/java-log4j/Makefile.am index 7d6c0481a..60d5c37f0 100644 --- 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 -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 -endif # BUILD_JAVA_LOG4J_AGENT - -JTestLTTng.class: JTestLTTng.java static_file: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \