X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2FMakefile.am;h=7d6c0481a0997629587a9183299560b5b32972e7;hp=7035ecf929feaad9da4d51d61ddbe21ca6c91ae2;hb=de76faf845535b90c71a30b996b411348f81f6be;hpb=504d4ace8d2c38787fe40b7e74cbb932cb7f3d89 diff --git a/tests/regression/ust/java-log4j/Makefile.am b/tests/regression/ust/java-log4j/Makefile.am index 7035ecf92..7d6c0481a 100644 --- a/tests/regression/ust/java-log4j/Makefile.am +++ b/tests/regression/ust/java-log4j/Makefile.am @@ -1,4 +1,3 @@ -if BUILD_JAVA_LOG4J_AGENT noinst_SCRIPTS = test_java_log4j JTestLTTng.java EXTRA_DIST = test_java_log4j JTestLTTng.java @@ -9,14 +8,19 @@ else JCC=javac endif -all-local: JTestLTTng.class +# 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 -all-local: +static_file: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ for script in $(EXTRA_DIST); do \ cp -f $(srcdir)/$$script $(builddir); \ @@ -31,4 +35,3 @@ clean-local: done; \ fi -endif # BUILD_JAVA_LOG4J_AGENT