Fix: test: java-jul:missing static test files for dist and out of tree build
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Fri, 30 Jan 2015 22:04:56 +0000 (17:04 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 6 Feb 2015 17:11:47 +0000 (12:11 -0500)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
tests/regression/ust/java-jul/Makefile.am

index 4446c524fb72311d83068ac3d4bbc06f8da6eb82..286e3df2293611f2888cbd8603529de6c5eea937 100644 (file)
@@ -1,4 +1,3 @@
-if BUILD_JAVA_AGENT
 
 noinst_SCRIPTS = test_java_jul JTestLTTng.java
 EXTRA_DIST = test_java_jul JTestLTTng.java
 
 noinst_SCRIPTS = test_java_jul JTestLTTng.java
 EXTRA_DIST = test_java_jul JTestLTTng.java
@@ -11,20 +10,25 @@ endif
 
 AGENT_JAR_FILE=$(java_agent_jar_path)
 
 
 AGENT_JAR_FILE=$(java_agent_jar_path)
 
-all-local: JTestLTTng.class
 
 
+# Still need to copy test files in case of out of tree build
+if BUILD_JAVA_AGENT
+all-local: static_file JTestLTTng.class
 %.class: %.java
        $(JCC) -d "$(builddir)" -cp "$(AGENT_JAR_FILE):." $<
 %.class: %.java
        $(JCC) -d "$(builddir)" -cp "$(AGENT_JAR_FILE):." $<
+else
+all-local: static_file
+endif # BUILD_JAVA_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); \
                done; \
        fi
 
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
                for script in $(EXTRA_DIST); do \
                        cp -f $(srcdir)/$$script $(builddir); \
                done; \
        fi
 
+
 clean-local:
        rm -f *.class
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
 clean-local:
        rm -f *.class
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
@@ -33,4 +37,3 @@ clean-local:
                done; \
        fi
 
                done; \
        fi
 
-endif # BUILD_JAVA_AGENT
This page took 0.034881 seconds and 4 git commands to generate.