Revert "Detect and document dependency on -ldl on Linux, -lc on BSD for dlopen"

[lttng-ust.git] / tests / demo / Makefile.am

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 05a1d807a723d7b75d952716e8b603265e0b7650..f96980ed6514ae91d2a0024011282de573c41f39 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,8 +1,17 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-# The demo program only depends on libdl.
-LIBS = -ldl
+# -Wsystem-headers is needed to print warnings in the tracepoint
+# description file.
+AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+
+# Set LIBS to nothing so the application does not link on useless
+# libraries.
+LIBS =
 
-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
@@ -11,12 +20,18 @@ 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_LDFLAGS = -ldl