X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=328c6b0f0432c6c4139b1fc951169e198887298b;hb=f9364363c8982127d66c2a29cb1fa21760bd00e5;hp=06905972b4917deac7889822b22eeac92a22e054;hpb=4de5e07708b87957e055bb619045953a28267c79;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 06905972..328c6b0f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -4,12 +4,13 @@ doc_examples_gen_tpdir = ${docdir}/examples/gen-tp
 doc_examples_demodir = ${docdir}/examples/demo
 doc_examples_hello_static_libdir = ${docdir}/examples/hello-static-lib
 doc_examples_demo_tracefdir = ${docdir}/examples/demo-tracef
+doc_examples_clock_overridedir = ${docdir}/examples/clock-override
 
-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
 
@@ -43,12 +44,17 @@ dist_doc_examples_demo_tracef_DATA = demo-tracef/Makefile \
 	demo-tracef/demo-tracef.c \
 	demo-tracef/README
 
+dist_doc_examples_clock_override_DATA = clock-override/Makefile \
+	clock-override/lttng-ust-clock-override-example.c \
+	clock-override/run-clock-override \
+	clock-override/README
+
 if NO_SHARED
 # Don't build examples if shared libraries support was explicitly
 # disabled.
 else
 # Copies are for VPATH build support
-SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef
+SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef clock-override
 
 if BUILD_GEN_TP_EXAMPLES
 SUBDIRS_PROXY += gen-tp
@@ -57,7 +63,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 +85,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;