X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=4afeaad79529bc4fad86eb377a70bdec5c0a04b7;hb=457a6b5879a7dd8cdd1b5b22b20d028a59489159;hp=6e4a603b7aa78541154b92f7dd1fbc2398285b48;hpb=ff412fb523eeacd9f2b698ccefc4f716ace9afd0;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 6e4a603b..4afeaad7 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -2,13 +2,18 @@
 # 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 build static by default
+FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
+			   -rpath $(abs_builddir)
+
+PROBE_LIBS = -lurcu-bp -lurcu-bp -luuid -lpthread -ldl
+
+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
@@ -17,14 +22,20 @@ 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) \
+	$(PROBE_LIBS)
 
 #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) \
+	$(PROBE_LIBS)
 
 noinst_PROGRAMS = demo
 demo_SOURCES = demo.c ust_tests_demo.h
 # The demo program only depends on libdl.
-demo_LIBS = -ldl
+demo_LDFLAGS = -ldl