Revert "Revert "Fix linker library order""

[lttng-ust.git] / doc / examples / demo / Makefile

diff --git a/doc/examples/demo/Makefile b/doc/examples/demo/Makefile
index 0c829da965c39a3209237655e4a78476cc14656b..bbc8ccb7e6aae5821acf44236403a9865c195f07 100644 (file)
--- a/doc/examples/demo/Makefile
+++ b/doc/examples/demo/Makefile
@@ -36,23 +36,26 @@ endif
 
 all: demo lttng-ust-provider-ust-tests-demo.so lttng-ust-provider-ust-tests-demo3.so
 
-lttng-ust-provider-ust-tests-demo.o: tp.c tp2.c ust_tests_demo.h ust_tests_demo2.h
-       $(CC) $(CFLAGS) -fpic -c -o $@ $<
+tp.o: tp.c ust_tests_demo.h
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $<
 
-lttng-ust-provider-ust-tests-demo.so: lttng-ust-provider-ust-tests-demo.o
-       $(CC) -shared -o $@ $(LDFLAGS) -llttng-ust $<
+tp2.o: tp2.c ust_tests_demo2.h
+       $(CC) $(CPPFLAGS) $(CFLAGS) -fpic -c -o $@ $<
 
-lttng-ust-provider-ust-tests-demo3.o: tp3.c ust_tests_demo3.h
-       $(CC) $(CFLAGS) -fpic -c -o $@ $<
+lttng-ust-provider-ust-tests-demo.so: tp.o tp2.o
+       $(CC) -shared -o $@ $(LDFLAGS) -llttng-ust $^
 
-lttng-ust-provider-ust-tests-demo3.so: lttng-ust-provider-ust-tests-demo3.o
-       $(CC) -shared -o $@ $(LDFLAGS) -llttng-ust $<
+tp3.o: tp3.c ust_tests_demo3.h
+       $(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) demo.o -o $@ $(LIBS)
+       $(CC) -o $@ $^ $(LIBS)
 
 .PHONY: clean
 clean: