X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=6f0a31aa37d777498aa516d17ba836d35b4950b6;hb=8da6d0c8216f13df8f714459b7d855243296d83c;hp=06905972b4917deac7889822b22eeac92a22e054;hpb=4de5e07708b87957e055bb619045953a28267c79;p=lttng-ust.git diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 06905972..6f0a31aa 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -5,11 +5,11 @@ doc_examples_demodir = ${docdir}/examples/demo doc_examples_hello_static_libdir = ${docdir}/examples/hello-static-lib doc_examples_demo_tracefdir = ${docdir}/examples/demo-tracef -if BUILD_JNI_INTERFACE +if BUILD_JAVA_AGENT doc_examples_java_juldir = ${docdir}/examples/java-jul dist_doc_examples_java_jul_DATA = java-jul/Makefile \ - java-jul/Hello.java \ - java-jul/run + java-jul/Hello.java \ + java-jul/run SUBDIRS_JUL = java-jul endif @@ -57,7 +57,7 @@ endif all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL); do \ - cp -fR $(srcdir)/$$subdir $(builddir); \ + cp -pfR $(srcdir)/$$subdir $(builddir); \ done; \ fi; \ if [ x"$(shell echo "$(top_srcdir)" | grep "^/" | wc -l)" = x"1" ]; then \ @@ -79,7 +79,7 @@ all-local: done; \ if [ x"$(SUBDIRS_JUL)" != x"" ]; then \ for subdir in $(SUBDIRS_JUL); do \ - (cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-jul" JAVA_JARFILE_OVERRIDE="liblttng-ust-jul.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \ + (cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \ done; \ fi;