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

diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am
index 7d713a9a5..b0a04f30c 100644
--- a/tests/regression/ust/java-jul/Makefile.am
+++ b/tests/regression/ust/java-jul/Makefile.am
@@ -1,24 +1,15 @@
-if BUILD_JAVA_JUL
+JAVAROOT = .
 
-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
-else
-JCC=javac
-endif
+if TEST_JAVA_JUL_AGENT
+dist_noinst_JAVA = JTestLTTng.java
+endif # TEST_JAVA_JUL_AGENT
 
-JUL_JAR_FILE=$(java_jul_jar_path)
+all-local: static_file
 
-all-local: JTestLTTng.class
-
-%.class: %.java
-	$(JCC) -d "$(builddir)" -cp "$(JUL_JAR_FILE):." $<
-
-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); \
@@ -33,4 +24,3 @@ clean-local:
 		done; \
 	fi
 
-endif # BUILD_JAVA_JUL