X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=493e07dd62997b83636f12d9a4267cf43211bc9b;hb=702d1b7d91bc75f4fc01415fc625af1b834ddec4;hp=239046fdb31a331673819cd3456f02737aa98a1b;hpb=e5b701c85783b6c19ddf39601e8beba3766417a8;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 239046fd..493e07dd 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -97,10 +97,6 @@ dist_doc_examples_getcpu_override_DATA = getcpu-override/Makefile \
 	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 hello-static-lib demo-tracef clock-override \
 		getcpu-override demo-tracelog
@@ -131,7 +127,7 @@ 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/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
+		(cd $$subdir && $(MAKE) CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I$$rel_src_subdir$(top_srcdir)/include/ -I$$rel_build_subdir$(top_builddir)/include/" 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/"' LTTNG_GEN_TP_PATH="../../../tools/" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
 	done; \
 	if [ x"$(SUBDIRS_JUL)" != x"" ]; then \
 		for subdir in $(SUBDIRS_JUL); do \
@@ -149,14 +145,14 @@ all-local:
 				cd $$subdir && \
 				$(MKDIR_P) build && \
 				cd build && \
-				CC=$(CC) \
-				CXX=$(CXX) \
+				CC="$(CC)" \
+				CXX="$(CXX)" \
 				cmake \
 				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
 				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
-				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
-				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
-				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+				-DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
+				-DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
+				-DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
 				.. && \
 				$(MAKE) && \
 				cd .. \
@@ -197,4 +193,3 @@ clean-local:
 			rm -rf $(builddir)/$$subdir; \
 		done; \
 	fi;
-endif