X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=6e4a603b7aa78541154b92f7dd1fbc2398285b48;hb=e81a53afbf8fc88951cace52adc45bb02994fe55;hp=1988dac46951d0dafe80835a0d6a2d1967b1b5a5;hpb=deb6e5408bafcab23cdd3e04b080134931d83906;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 1988dac4..6e4a603b 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,6 +1,14 @@
-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 \
+# We install the plugins into the /tmp/lttng-ust-divert directory to
+# please libtool, which absolutely needs a target install location. We
+# don't want to pollute the system with test program plugins.
+# We use the .so in .libs/ for the tests.
+noinst_plugins_libdir = "/tmp/lttng-ust-divert"
+
+noinst_plugins_lib_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
@@ -18,3 +26,5 @@ liblttng_ust_provider_ust_tests_demo3_la_LIBADD = \
 
 noinst_PROGRAMS = demo
 demo_SOURCES = demo.c ust_tests_demo.h
+# The demo program only depends on libdl.
+demo_LIBS = -ldl