From a8ffd975ecb26f318ee71afe7ad980e4910d49db Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 21 Jul 2013 17:51:26 -0400 Subject: [PATCH] Revert "Disable doc/examples build" This reverts commit a69663741646c3ef10a495b11fe8b23fcd7219b8. In preparation for upcoming VPATH build fix. Signed-off-by: Mathieu Desnoyers --- doc/examples/Makefile.am | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 6bb13a7f..25d34f3b 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -30,19 +30,19 @@ dist_doc_examples_hello_static_lib_DATA = hello-static-lib/Makefile \ hello-static-lib/ust_tests_hello.h \ hello-static-lib/tp.c -#if NO_SHARED -## Don't build examples if shared libraries support was explicitly -## disabled. -#else -#SUBDIRS_PROXY = easy-ust demo gen-tp hello-static-lib -# -#all-local: -# for subdir in $(SUBDIRS_PROXY); do \ -# cd $$subdir && $(MAKE) AM_CPPFLAGS="-I../../../include/" AM_LDFLAGS='-L../../../liblttng-ust/.libs/ -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../tools/" $(AM_MAKEFLAGS) all; cd ..; \ -# done -# -#clean-local: -# for subdir in $(SUBDIRS_PROXY); do \ -# cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean; cd ..; \ -# done -#endif +if NO_SHARED +# Don't build examples if shared libraries support was explicitly +# disabled. +else +SUBDIRS_PROXY = easy-ust demo gen-tp hello-static-lib + +all-local: + for subdir in $(SUBDIRS_PROXY); do \ + cd $$subdir && $(MAKE) AM_CPPFLAGS="-I../../../include/" AM_LDFLAGS='-L../../../liblttng-ust/.libs/ -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/"' LTTNG_GEN_TP_PATH="../../tools/" $(AM_MAKEFLAGS) all; cd ..; \ + done + +clean-local: + for subdir in $(SUBDIRS_PROXY); do \ + cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean; cd ..; \ + done +endif -- 2.34.1