Remove the need to install them in /tmp
Signed-off-by: Yannick Brosseau <[email protected]>
---
tests/demo/Makefile.am | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 6e4a603..f726b25 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -2,13 +2,12 @@
# 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"
+# 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)
-noinst_plugins_lib_LTLIBRARIES = liblttng-ust-provider-ust-tests-demo.la \
+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,12 +16,14 @@ 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
--
1.7.8.2
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
