X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=0ae14b98eb00ad330b1fdf0bd1cf25987a571f4f;hb=0cb03c850dedb8f1e7f11e2e47764aa4d3ba313b;hp=e19af38c86d8e9e751b8cc8c1fb014b2fdb872a2;hpb=0faf99b80e69821dc5a42aad15b139c9e4cbf450;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index e19af38c..0ae14b98 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -3,14 +3,16 @@ doc_examples_easy_ustdir = ${docdir}/examples/easy-ust
 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
+doc_examples_getcpu_overridedir = ${docdir}/examples/getcpu-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
-bin_SCRIPTS = java-jul/Makefile
 endif
 
 dist_doc_examples_DATA = README
@@ -39,17 +41,36 @@ dist_doc_examples_hello_static_lib_DATA = hello-static-lib/Makefile \
 	hello-static-lib/ust_tests_hello.h \
 	hello-static-lib/tp.c
 
+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
+
+dist_doc_examples_getcpu_override_DATA = getcpu-override/Makefile \
+	getcpu-override/lttng-ust-getcpu-override-example.c \
+	getcpu-override/run-getcpu-override \
+	getcpu-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 gen-tp hello-static-lib
+SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef clock-override \
+		getcpu-override
+
+if BUILD_GEN_TP_EXAMPLES
+SUBDIRS_PROXY += gen-tp
+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 \
@@ -67,11 +88,11 @@ all-local:
 		rel_build_subdir="../"; \
 	fi; \
 	for subdir in $(SUBDIRS_PROXY); do \
-		(cd $$subdir && $(MAKE) AM_CC="$(CC)" AM_CPPFLAGS="$(CPPFLAGS) -I$$rel_src_subdir$(top_srcdir)/include/ -I$$rel_build_subdir$(top_builddir)/include/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../liblttng-ust/.libs/ -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
+		(cd $$subdir && $(MAKE) AM_CC="$(CC)" AM_CPPFLAGS="$(CPPFLAGS) -I$$rel_src_subdir$(top_srcdir)/include/ -I$$rel_build_subdir$(top_builddir)/include/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
 	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;