X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=5bc1f4c9c2aeb350b3fe5899bcba7626fc7705c3;hb=e9ab43a242e23bc3b179f7bf9be3e19f319e9ff0;hp=50a534e81a767471d68fa37ed062fa4655e12c43;hpb=068160b1fad829b0c19c09b9e119df42cbb4368b;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 50a534e8..5bc1f4c9 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -34,7 +34,7 @@ dist_doc_examples_python_DATA = python/hello.py
 endif
 
 if HAVE_CMAKE
-if HAVE_CXX
+if CXX_WORKS
 SUBDIRS_CMAKE = cmake-multiple-shared-libraries
 endif
 endif
@@ -147,9 +147,17 @@ all-local:
 		for subdir in $(SUBDIRS_CMAKE); do \
 			( \
 				cd $(SUBDIRS_CMAKE) && \
-				mkdir -p build && \
+				$(MKDIR_P) build && \
 				cd build && \
-				cmake -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" .. && \
+				cmake \
+				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
+				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
+				-DCMAKE_C_COMPILER="$(CC)" \
+				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_CXX_COMPILER="$(CXX)" \
+				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+				.. && \
 				$(MAKE) && \
 				cd .. \
 			) || exit 1; \