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=4446c524fb72311d83068ac3d4bbc06f8da6eb82;hb=249a620db4e9461ffecae7286820913913c8584f;hpb=c49fc5e4a0d11d8d4fa87485a975bda66413b4d2;ds=sidebyside diff --git a/tests/regression/ust/java-jul/Makefile.am b/tests/regression/ust/java-jul/Makefile.am index 4446c524f..286e3df22 100644 --- a/tests/regression/ust/java-jul/Makefile.am +++ b/tests/regression/ust/java-jul/Makefile.am @@ -1,4 +1,3 @@ -if BUILD_JAVA_AGENT 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) -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):." $< +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_AGENT