From 9036849a571580ead9b1b088baa98cc8f03e2964 Mon Sep 17 00:00:00 2001 From: Yannick Brosseau Date: Fri, 6 Jan 2012 13:39:38 -0500 Subject: [PATCH] Force the building of shared noinst libraries in the demo test program Remove the need to install them in /tmp Signed-off-by: Yannick Brosseau Signed-off-by: Mathieu Desnoyers --- tests/demo/Makefile.am | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am index 6e4a603b..f726b257 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 -- 2.34.1