X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=8ee05646624940f1661d988000d669bee875cbfe;hb=cadfcbfcd89795086bfeb49af84dadc35154c754;hp=d713d1eadb8108ed57e653c486c7cc537afeb7c3;hpb=7433d32d5a8f0e8833461b586a8c8b2274da0141;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index d713d1ea..8ee05646 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -132,14 +132,17 @@ all-local:
 			$(MAKE) all \
 				AR="$(AR)" \
 				CC="$(CC)" \
+				PYTHON="$(PYTHON)" \
 				CPPFLAGS="$(CPPFLAGS)" \
 				AM_CPPFLAGS="$(AM_CPPFLAGS) \
 				-I$$rel_src_subdir$(top_srcdir)/include/ \
-				-I$$rel_build_subdir$(top_builddir)/include/" \
+				-I$$rel_build_subdir$(top_builddir)/include/ \
+				-I$$rel_src_subdir$(top_srcdir)/src/ \
+				-I$$rel_build_subdir$(top_builddir)/src/" \
 				CFLAGS='$(CFLAGS)' \
 				AM_CFLAGS='$(AM_CFLAGS)' \
 				LDFLAGS="$(LDFLAGS)" \
-				AM_LDFLAGS='$(AM_LDFLAGS) -L../../../liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' \
+				AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \
 				LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \
 				AM_V_P="$(AM_V_P)" \
 				AM_V_at="$(AM_V_at)" \
@@ -152,8 +155,8 @@ 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" \
+					JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul" \
+					JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \
 					$(AM_MAKEFLAGS) \
 			) || exit 1; \
 		done; \
@@ -164,8 +167,8 @@ 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" \
+					JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j" \
+					JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common" \
 					$(AM_MAKEFLAGS) \
 			) || exit 1; \
 		done; \
@@ -181,7 +184,7 @@ all-local:
 					CXX="$(CXX)" \
 					$(CMAKE) \
 					-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
-					-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
+					-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs" \
 					-DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \
 					-DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
 					-DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \