Both patches merged, thanks! Jérémie
On Fri, Jan 30, 2015 at 5:04 PM, Jonathan Rajotte <[email protected]> wrote: > Signed-off-by: Jonathan Rajotte <[email protected]> > --- > tests/regression/ust/java-jul/Makefile.am | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/tests/regression/ust/java-jul/Makefile.am > b/tests/regression/ust/java-jul/Makefile.am > index 4446c52..286e3df 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 > -- > 1.9.1 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
