X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=e4570ff0a694d9fea50f14f5ed8e89696832e7a1;hb=47b91171d6ca3ceec1a85c5f537d9901cd3f62ef;hp=40e43690e11c28a2a41faa4646206a92990f9378;hpb=4937e69d8f911d5e7c6e835c1ae0f924188f8293;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 40e43690..e4570ff0 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,12 +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
 
-# 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"
+# Set LIBS to nothing so the application does not link on useless
+# libraries.
+LIBS =
 
-noinst_plugins_lib_LTLIBRARIES = liblttng-ust-provider-ust-tests-demo.la \
+# 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
@@ -15,14 +20,24 @@ 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
+# The demo program only depends on libdl/libc for dlopen().
+if LTTNG_UST_BUILD_WITH_LIBDL
+demo_LDADD = -ldl
+endif
+if LTTNG_UST_BUILD_WITH_LIBC_DL
+demo_LDADD = -lc
+endif
+