From a8566918c102aba0c780b77c62b16f4e4ff27712 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 17 Jan 2012 17:04:53 -0500 Subject: [PATCH] demo program: ensure we don't link demo on useless libs Signed-off-by: Mathieu Desnoyers --- tests/demo/Makefile.am | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am index f726b257..4afeaad7 100644 --- a/tests/demo/Makefile.am +++ b/tests/demo/Makefile.am @@ -2,11 +2,17 @@ # description file. AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers +# Set LIBS to nothing so the application does not link on useless +# libraries. +LIBS = + # 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 @@ -16,16 +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) +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) +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 -- 2.34.1