X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2FMakefile.am;h=c9f4f3df1bcbd0d893223e9d9ac44b6f6d225512;hb=5f45beacd3a1039746de6777a287f01093472191;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..c9f4f3df1 100644 --- a/tests/regression/ust/java-jul/Makefile.am +++ b/tests/regression/ust/java-jul/Makefile.am @@ -1,7 +1,5 @@ -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 @@ -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