X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=73fadf5a3f0dea3f97aa4b879948d78914112f12;hb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;hp=dc37489687e28d7a34a103ecc4d0d1357afc67b8;hpb=54435b75df4c16be1ae0e1c86d5ee1f894b97e73;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index dc374896..73fadf5a 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -81,10 +81,12 @@ dist_doc_examples_hello_static_lib_DATA = hello-static-lib/Makefile \
 
 dist_doc_examples_demo_tracef_DATA = demo-tracef/Makefile \
 	demo-tracef/demo-tracef.c \
+	demo-tracef/demo-vtracef.c \
 	demo-tracef/README
 
 dist_doc_examples_demo_tracelog_DATA = demo-tracelog/Makefile \
 	demo-tracelog/demo-tracelog.c \
+	demo-tracelog/demo-vtracelog.c \
 	demo-tracelog/README
 
 dist_doc_examples_clock_override_DATA = clock-override/Makefile \
@@ -147,9 +149,10 @@ all-local:
 			( \
 				cd $$subdir && \
 				$(MAKE) all \
+					CLASSPATH="$(CLASSPATH)" \
 					JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" \
 					JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \
-					$(AM_MAKEFLAGS) \
+					$(AM_MAKEFLAGS) \
 			) || exit 1; \
 		done; \
 	fi; \
@@ -158,6 +161,7 @@ all-local:
 			( \
 				cd $$subdir && \
 				$(MAKE) all \
+					CLASSPATH="$(CLASSPATH)" \
 					JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \
 					JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \
 					$(AM_MAKEFLAGS) \
@@ -176,8 +180,8 @@ all-local:
 					cmake \
 					-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
 					-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
-					-DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
-					-DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
+					-DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \
+					-DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
 					-DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
 					.. && \
 				$(MAKE) \