X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=c16210f43414564ed522ce14f694c92c74aea8a8;hb=14b6f89117234871ef9f750c4d282975397e30b7;hp=b66acaf4db63573f918464ab03d6255eb31722fd;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index b66acaf4..c16210f4 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -11,7 +11,7 @@ doc_examples_clock_overridedir = ${docdir}/examples/clock-override
 doc_examples_getcpu_overridedir = ${docdir}/examples/getcpu-override
 doc_examples_cmakedir = ${docdir}/examples/cmake-multiple-shared-libraries
 
-if BUILD_JAVA_AGENT_WITH_JUL
+if ENABLE_JAVA_AGENT_WITH_JUL
 doc_examples_java_juldir = ${docdir}/examples/java-jul
 dist_doc_examples_java_jul_DATA = java-jul/Makefile \
 				  java-jul/Hello.java \
@@ -22,7 +22,7 @@ dist_doc_examples_java_jul_DATA = java-jul/Makefile \
 SUBDIRS_JUL = java-jul
 endif
 
-if BUILD_JAVA_AGENT_WITH_LOG4J
+if ENABLE_JAVA_AGENT_WITH_LOG4J
 doc_examples_java_log4jdir = ${docdir}/examples/java-log4j
 dist_doc_examples_java_log4j_DATA = java-log4j/Makefile \
 				  java-log4j/Hello.java \
@@ -30,13 +30,13 @@ dist_doc_examples_java_log4j_DATA = java-log4j/Makefile \
 SUBDIRS_LOG4J = java-log4j
 endif
 
-if BUILD_PYTHON_AGENT
+if ENABLE_PYTHON_AGENT
 doc_examples_pythondir = ${docdir}/examples/python
 dist_doc_examples_python_DATA = python/hello.py
 endif
 
 if HAVE_CMAKE
-if CXX_WORKS
+if HAVE_CXX
 SUBDIRS_CMAKE = cmake-multiple-shared-libraries
 endif
 endif
@@ -105,7 +105,7 @@ dist_doc_examples_getcpu_override_DATA = getcpu-override/Makefile \
 SUBDIRS_PROXY = easy-ust demo hello-static-lib demo-tracef clock-override \
 		getcpu-override demo-tracelog
 
-if BUILD_GEN_TP_EXAMPLES
+if ENABLE_GEN_TP_EXAMPLES
 SUBDIRS_PROXY += gen-tp
 endif
 
@@ -132,6 +132,7 @@ all-local:
 			$(MAKE) all \
 				AR="$(AR)" \
 				CC="$(CC)" \
+				PYTHON="$(PYTHON)" \
 				CPPFLAGS="$(CPPFLAGS)" \
 				AM_CPPFLAGS="$(AM_CPPFLAGS) \
 				-I$$rel_src_subdir$(top_srcdir)/include/ \
@@ -140,7 +141,7 @@ all-local:
 				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/"' \
-				LTTNG_GEN_TP_PATH="../../../tools/" \
+				LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \
 				AM_V_P="$(AM_V_P)" \
 				AM_V_at="$(AM_V_at)" \
 				$(AM_MAKEFLAGS) \
@@ -179,7 +180,7 @@ all-local:
 				AR="$(AR)" \
 					CC="$(CC)" \
 					CXX="$(CXX)" \
-					cmake \
+					$(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) $(CPPFLAGS) $(CFLAGS)" \