X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2FMakefile.am;h=2ba8cd89462a8b2a7f5a65f6e5f296ff76fa789d;hb=b6b4fee0e53907592ae360b975adfd5013bfc8e5;hp=cb46d2c200e2770de062333e30b7a0f0ccea3d07;hpb=5f836e39f04c7c90439b1306ccc73b20c9c95957;p=lttng-ust.git

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index cb46d2c2..2ba8cd89 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
@@ -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
@@ -110,48 +106,88 @@ SUBDIRS_PROXY += gen-tp
 endif
 
 all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+	$(AM_V_at)if [ x"$(srcdir)" != x"$(builddir)" ]; then \
 		for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL) $(SUBDIRS_LOG4J) $(SUBDIRS_CMAKE); do \
 			cp -pfR $(srcdir)/$$subdir $(builddir); \
 			chmod -R u+w $(builddir)/$$subdir; \
 		done; \
 	fi; \
 	if [ x"$(shell echo "$(top_srcdir)" | grep "^/" | wc -l)" = x"1" ]; then \
-		echo "Examples: absolute top_srcdir path $(top_srcdir)"; \
 		rel_src_subdir=""; \
 	else \
-		echo "Examples: relative top_srcdir path $(top_srcdir)"; \
 		rel_src_subdir="../"; \
 	fi; \
 	if [ x"$(shell echo "$(top_builddir)" | grep "^/" | wc -l)" = x"1" ]; then \
-		echo "Examples: absolute top_builddir path $(top_builddir)"; \
 		rel_build_subdir=""; \
 	else \
-		echo "Examples: relative top_builddir path $(top_builddir)"; \
 		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) all \
+				AR="$(AR)" \
+				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_V_P="$(AM_V_P)" \
+				AM_V_at="$(AM_V_at)" \
+				$(AM_MAKEFLAGS) \
+		) || exit 1; \
 	done; \
 	if [ x"$(SUBDIRS_JUL)" != x"" ]; then \
 		for subdir in $(SUBDIRS_JUL); do \
-			(cd $(SUBDIRS_JUL) && $(MAKE) 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) all && cd ..) || exit 1; \
+			( \
+				cd $$subdir && \
+				$(MAKE) all \
+					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) \
+			) || exit 1; \
 		done; \
 	fi; \
 	if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \
 		for subdir in $(SUBDIRS_LOG4J); do \
-			(cd $(SUBDIRS_LOG4J) && $(MAKE) 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) all && cd ..) || exit 1; \
+			( \
+				cd $$subdir && \
+				$(MAKE) all \
+					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) \
+			) || exit 1; \
 		done; \
-	fi;
+	fi; \
 	if [ x"$(SUBDIRS_CMAKE)" != x"" ]; then \
 		for subdir in $(SUBDIRS_CMAKE); do \
-			(cd $(SUBDIRS_CMAKE) && mkdir -p build && cd build && cmake .. && $(MAKE) && cd ..) || exit 1; \
+			( \
+				cd $$subdir && \
+				$(MKDIR_P) build && \
+				cd build && \
+				AR="$(AR)" \
+					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="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
+					-DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \
+					-DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \
+					.. && \
+				$(MAKE) \
+			) || exit 1; \
 		done; \
 	fi;
 
 
 clean-local:
-	@for subdir in $(SUBDIRS_PROXY); do \
+	$(AM_V_at)for subdir in $(SUBDIRS_PROXY); do \
 		if [ -d $$subdir ]; then \
 			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \
 		fi; \
@@ -182,4 +218,3 @@ clean-local:
 			rm -rf $(builddir)/$$subdir; \
 		done; \
 	fi;
-endif