X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=5adafdc5ff31e892e768a030633ce5cff0e3367c;hb=63fae78781b6f55b7345aa018250bf92834460e5;hp=eafb076fbebb6e8279ff6d9e1a2cf72ca14400ab;hpb=580d134ba57956bdf709ef892cd27df40b956656;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index eafb076f..5adafdc5 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,8 +1,42 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+# -Wsystem-headers is needed to print warnings in the tracepoint
+# description file.
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 
-noinst_PROGRAMS = demo
-demo_SOURCES = demo.c tp.c ust_tests_demo.h
-demo_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
+# Set LIBS to nothing so the application does not link on useless
+# libraries.
+LIBS =
+
+if NO_SHARED
+# Do not build this test if shared libraries support was
+# explicitly disabled.
+else
+# 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
 
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+#contains ust_tests_demo.h and ust_tests_demo2.h provider probes
+liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
+	tp.c ust_tests_demo.h \
+	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
+endif