Build out of src tree

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

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 4afeaad79529bc4fad86eb377a70bdec5c0a04b7..0e432552a61a01229da72cdcdf60ab7c7772ecaf 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,18 +1,16 @@
 # -Wsystem-headers is needed to print warnings in the tracepoint
 # description file.
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/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
+# 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,10 +29,15 @@ 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.
-demo_LDFLAGS = -ldl
+# 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
+