From 7d30b25e1ad42e64011b2bc98eccffbbb5ee3f40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 6 Feb 2015 15:23:19 -0500 Subject: [PATCH] Test: java-jul:missing static test files for dist and out of tree build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- tests/regression/ust/java-jul/Makefile.am | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am index 302d2efda..c9f4f3df1 100644 --- a/tests/regression/ust/java-jul/Makefile.am +++ b/tests/regression/ust/java-jul/Makefile.am @@ -1,5 +1,3 @@ -if BUILD_JAVA_JUL - noinst_SCRIPTS = test_java_jul JTestLTTng.java EXTRA_DIST = test_java_jul JTestLTTng.java @@ -11,14 +9,17 @@ endif JUL_JAR_FILE=$(java_jul_jar_path) -all-local: JTestLTTng.class +# Still need to copy test files in case of out of tree build +if BUILD_JAVA_JUL +all-local: static_file JTestLTTng.class %.class: %.java $(JCC) -d "$(builddir)" -cp "$(JUL_JAR_FILE):." $< +else +all-local: static_file +endif #BUILD_JAVA_JUL -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); \ @@ -32,5 +33,3 @@ clean-local: rm -f $(builddir)/$$script; \ done; \ fi - -endif # BUILD_JAVA_JUL -- 2.34.1