Test: java-jul:missing static test files for dist and out of tree build
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 6 Feb 2015 20:23:19 +0000 (15:23 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 6 Feb 2015 20:33:14 +0000 (15:33 -0500)
Reported-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
tests/regression/ust/java-jul/Makefile.am

index 302d2efda36f5681da29b5e200435354eff70d6a..c9f4f3df1bcbd0d893223e9d9ac44b6f6d225512 100644 (file)
@@ -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
This page took 0.027782 seconds and 4 git commands to generate.