From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 6 Feb 2015 20:23:19 +0000 (-0500)
Subject: Test: java-jul:missing static test files for dist and out of tree build
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=refs%2Fheads%2Fstable-2.4;p=lttng-tools.git

Test: java-jul:missing static test files for dist and out of tree build

Reported-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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