Fix examples: add missing CPPFLAGS

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

diff --git a/doc/examples/demo/Makefile b/doc/examples/demo/Makefile
index bb7eb6dec481326e0201f3f9f342c7fc6b107dcd..7ae6547eff4a476bf2f75bae96cf4e90f3550213 100644 (file)
--- a/doc/examples/demo/Makefile
+++ b/doc/examples/demo/Makefile
@@ -37,22 +37,22 @@ endif
 all: demo lttng-ust-provider-ust-tests-demo.so lttng-ust-provider-ust-tests-demo3.so
 
 tp.o: tp.c ust_tests_demo.h
-       $(CC) $(CFLAGS) -fpic -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $<
 
 tp2.o: tp2.c ust_tests_demo2.h
-       $(CC) $(CFLAGS) -fpic -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $<
 
 lttng-ust-provider-ust-tests-demo.so: tp.o tp2.o
        $(CC) -shared -o $@ $(LDFLAGS) -llttng-ust $^
 
 tp3.o: tp3.c ust_tests_demo3.h
-       $(CC) $(CFLAGS) -fpic -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $<
 
 lttng-ust-provider-ust-tests-demo3.so: tp3.o
        $(CC) -shared -o $@ $(LDFLAGS) -llttng-ust $^
 
 demo.o: demo.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 demo: demo.o
        $(CC) -o $@ $(LIBS) $^

diff --git a/doc/examples/easy-ust/Makefile b/doc/examples/easy-ust/Makefile
index 304632bb3f37fff275173449998a169d1b5d7244..e20e53a959074da42c701a1b497f39bd5b6a3bf3 100644 (file)
--- a/doc/examples/easy-ust/Makefile
+++ b/doc/examples/easy-ust/Makefile
@@ -42,10 +42,10 @@ sample: sample.o tp.o
        $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 sample.o: sample.c sample_component_provider.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 tp.o: tp.c sample_component_provider.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 html: sample_component_provider.html sample.html tp.html
 

diff --git a/doc/examples/gen-tp/Makefile b/doc/examples/gen-tp/Makefile
index 127fb95f2ddbf37e0c10268b82d44faf29b81521..ac18d49274d85d13f53eb97c35dbaafb91d4d900 100644 (file)
--- a/doc/examples/gen-tp/Makefile
+++ b/doc/examples/gen-tp/Makefile
@@ -26,7 +26,7 @@ sample: sample.o sample_tracepoint.o
        $(CC) -o $@ $^ $(LIBS)
 
 sample.o: sample.c sample_tracepoint.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 # Use this command to compile the .c manually
 #sample_tracepoint.o: sample_tracepoint.c sample_tracepoint.h

diff --git a/doc/examples/hello-static-lib/Makefile b/doc/examples/hello-static-lib/Makefile
index 3da65f042971529bf3d76f0b57cf2b0cdb9222c9..a5bf2df1a6b32fdb5ff5e62f7ce52a5a002b79a5 100644 (file)
--- a/doc/examples/hello-static-lib/Makefile
+++ b/doc/examples/hello-static-lib/Makefile
@@ -37,13 +37,13 @@ endif
 all: hello
 
 lttng-ust-provider-hello.o: tp.c ust_tests_hello.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 lttng-ust-provider-hello.a: lttng-ust-provider-hello.o
        ar -rc $@ $^
 
 hello.o: hello.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 hello: hello.o lttng-ust-provider-hello.a
        $(CC) -o $@ $(LDFLAGS) $(LIBS) $^