doc/examples: build gen-tp example by default

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 583909b65a8a97c211c7c44623bac968285c2663..25d34f3b881096841191b5bcce47756cda27551d 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -34,11 +34,11 @@ if NO_SHARED
 # Don't build examples if shared libraries support was explicitly
 # disabled.
 else
-SUBDIRS_PROXY = easy-ust demo hello-static-lib
+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/"' $(AM_MAKEFLAGS) all; cd ..; \
+               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:

diff --git a/doc/examples/gen-tp/Makefile b/doc/examples/gen-tp/Makefile
index c64cb9d4e721c90fb2cc744a5fe1e32eba0d7657..f1af23deda3325ac60889b026548c31bd51f4c02 100644 (file)
--- a/doc/examples/gen-tp/Makefile
+++ b/doc/examples/gen-tp/Makefile
@@ -25,19 +25,22 @@ LIBS = -ldl -llttng-ust             #On Linux
 all: sample
 
 sample: sample.o sample_tracepoint.o
-       $(CC) -o $@ $(LIBS) sample.o sample_tracepoint.o
+       $(CC) $(LDFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(AM_CFLAGS) \
+               -o $@ $(LIBS) sample.o sample_tracepoint.o
 
 sample.o: sample.c sample_tracepoint.h
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) \
+               -c -o $@ $<
 
 # Use this command to compile the .c manually
 #sample_tracepoint.o: sample_tracepoint.c sample_tracepoint.h
-#      $(CC) $(CFLAGS) -I. -c -o $@ $<
+#      $(CC) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) \
+#              -I. -c -o $@ $<
 
 # This rule generate .o only and depends on rules for generating
 # the .h and .c
 %.o: %.tp %.c %.h
-       lttng-gen-tp -o $@ $<
+       $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
 
 # The following rule can be used to generate all files instead of having one
 # for each file type. Note that the sample.o has a dependency on the
@@ -46,10 +49,10 @@ sample.o: sample.c sample_tracepoint.h
 #      lttng-gen-tp $<
 
 %.h: %.tp
-       lttng-gen-tp -o $@ $<
+       $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
 
 %.c: %.tp
-       lttng-gen-tp -o $@ $<
+       $(LTTNG_GEN_TP_PATH)lttng-gen-tp -o $@ $<
 
 .PHONY: clean
 clean: