Merged, thanks! Mathieu
----- Original Message ----- > From: "Christian Babeux" <[email protected]> > To: [email protected] > Cc: "mathieu desnoyers" <[email protected]>, "Christian Babeux" > <[email protected]> > Sent: Wednesday, September 24, 2014 3:44:05 PM > Subject: [PATCH lttng-ust] Fix: Wrong CLASSPATH when building > liblttng-ust-java-agent oot > > Signed-off-by: Christian Babeux <[email protected]> > --- > liblttng-ust-java-agent/java/Makefile.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/liblttng-ust-java-agent/java/Makefile.am > b/liblttng-ust-java-agent/java/Makefile.am > index c949bf8..01e81e5 100644 > --- a/liblttng-ust-java-agent/java/Makefile.am > +++ b/liblttng-ust-java-agent/java/Makefile.am > @@ -43,11 +43,11 @@ $(jarfile_old): classnoinst.stamp > $(pkgpath)/jul/*.class $(pkgpath_old)/*.class > > jul-jni-header.stamp: $(dist_noinst_JAVA) > - $(JAVAH) -cp $(CLASSPATH):. -d $(juljniout) $(JAVAHFLAGS) > org.lttng.ust.agent.jul.LTTngLogHandler && \ > + $(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) > org.lttng.ust.agent.jul.LTTngLogHandler && \ > echo "JUL JNI header generated" > jul-jni-header.stamp > > log4j-jni-header.stamp: $(dist_noinst_JAVA) > - $(JAVAH) -cp $(CLASSPATH):. -d $(log4jjniout) $(JAVAHFLAGS) > org.lttng.ust.agent.log4j.LTTngLogAppender && \ > + $(JAVAH) -cp $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) > org.lttng.ust.agent.log4j.LTTngLogAppender && \ > echo "Log4j JNI header generated" > log4j-jni-header.stamp > > all-local: $(stamp) > -- > 2.1.0 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
