X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=f96980ed6514ae91d2a0024011282de573c41f39;hb=68d9f89e9fced1108fdde97c53504d05d183ccdb;hp=f3f06dc17491166d368f5c74c907e934eeea9f84;hpb=6d638c8684444d282159583b664f369d31abe9aa;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index f3f06dc1..f96980ed 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,6 +1,17 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+# -Wsystem-headers is needed to print warnings in the tracepoint
+# description file.
+AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
 
-lib_LTLIBRARIES = liblttng-ust-provider-ust-tests-demo.la \
+# Set LIBS to nothing so the application does not link on useless
+# libraries.
+LIBS =
+
+# Force the shared flag on the noinst libraries since they are
+# only built static by default
+FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
+			   -rpath $(abs_builddir)
+
+noinst_LTLIBRARIES = liblttng-ust-provider-ust-tests-demo.la \
 	liblttng-ust-provider-ust-tests-demo3.la
 
 #contains ust_tests_demo.h and ust_tests_demo2.h provider probes
@@ -9,14 +20,18 @@ liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
 	tp2.c ust_tests_demo2.h
 liblttng_ust_provider_ust_tests_demo_la_LIBADD = \
 	$(top_builddir)/liblttng-ust/liblttng-ust.la
+liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
+	$(FORCE_SHARED_LIB_OPTIONS)
 
 #contains ust_tests_demo3.h provider probes
 liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
 	tp3.c ust_tests_demo3.h
 liblttng_ust_provider_ust_tests_demo3_la_LIBADD = \
 	$(top_builddir)/liblttng-ust/liblttng-ust.la
+liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
+	$(FORCE_SHARED_LIB_OPTIONS)
 
 noinst_PROGRAMS = demo
 demo_SOURCES = demo.c ust_tests_demo.h
 # The demo program only depends on libdl.
-demo_LIBS = -ldl
+demo_LDFLAGS = -ldl