X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2FMakefile.am;h=b0a04f30c5b603bed6eec3e53d8de3c031ecd9e5;hb=d4f53cc3de1217c965c2285709b784ff66a8033c;hp=286e3df2293611f2888cbd8603529de6c5eea937;hpb=249a620db4e9461ffecae7286820913913c8584f;p=lttng-tools.git

diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am
index 286e3df22..b0a04f30c 100644
--- a/tests/regression/ust/java-jul/Makefile.am
+++ b/tests/regression/ust/java-jul/Makefile.am
@@ -1,25 +1,13 @@
+JAVAROOT = .
 
 noinst_SCRIPTS = test_java_jul JTestLTTng.java
 EXTRA_DIST = test_java_jul JTestLTTng.java
 
-if HAVE_JAVA_JDK
-JCC=$(JAVA_JDK)/bin/javac
-else
-JCC=javac
-endif
+if TEST_JAVA_JUL_AGENT
+dist_noinst_JAVA = JTestLTTng.java
+endif # TEST_JAVA_JUL_AGENT
 
-AGENT_JAR_FILE=$(java_agent_jar_path)
-
-
-# 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):." $<
-else
 all-local: static_file
-endif # BUILD_JAVA_AGENT
-
 
 static_file:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
@@ -28,7 +16,6 @@ static_file:
 		done; \
 	fi
 
-
 clean-local:
 	rm -f *.class
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \