X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2FMakefile.am;h=286e3df2293611f2888cbd8603529de6c5eea937;hp=7d713a9a5d1a8c428a72bcac13d90fc3bbbc2814;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=37175ce4620a721d90235d7c906e49ecc14f62e3

diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am
index 7d713a9a5..286e3df22 100644
--- a/tests/regression/ust/java-jul/Makefile.am
+++ b/tests/regression/ust/java-jul/Makefile.am
@@ -1,7 +1,6 @@
-if BUILD_JAVA_JUL
 
-noinst_SCRIPTS = test_java_jul
-EXTRA_DIST = test_java_jul
+noinst_SCRIPTS = test_java_jul JTestLTTng.java
+EXTRA_DIST = test_java_jul JTestLTTng.java
 
 if HAVE_JAVA_JDK
 JCC=$(JAVA_JDK)/bin/javac
@@ -9,22 +8,27 @@ else
 JCC=javac
 endif
 
-JUL_JAR_FILE=$(java_jul_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 "$(JUL_JAR_FILE):." $<
+	$(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
 
+
 clean-local:
 	rm -f *.class
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
@@ -33,4 +37,3 @@ clean-local:
 		done; \
 	fi
 
-endif # BUILD_JAVA_JUL