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 4e113edc87705e0c9654d68b5b589df5e493533e..f96980ed6514ae91d2a0024011282de573c41f39 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -7,12 +7,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
 LIBS =
 
 # Force the shared flag on the noinst libraries since they are
-# only build static by default
+# only built 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
 
@@ -23,8 +21,7 @@ liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
 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)
+       $(FORCE_SHARED_LIB_OPTIONS)
 
 #contains ust_tests_demo3.h provider probes
 liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
@@ -32,16 +29,9 @@ liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
 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)
+       $(FORCE_SHARED_LIB_OPTIONS)
 
 noinst_PROGRAMS = demo
 demo_SOURCES = demo.c ust_tests_demo.h
-# The demo program only depends on libdl/libc for dlopen().
-if LTTNG_UST_BUILD_WITH_LIBDL
-demo_LDADD = -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-demo_LDADD = -lc
-endif
-
+# The demo program only depends on libdl.
+demo_LDFLAGS = -ldl