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

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index f726b257..5adafdc5 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,9 +1,17 @@
 # -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 =
+
+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 build static by default
+# only built static by default
 FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 			   -rpath $(abs_builddir)
 
@@ -16,16 +24,19 @@ 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)
 
 #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)
 
 noinst_PROGRAMS = demo
 demo_SOURCES = demo.c ust_tests_demo.h
 # The demo program only depends on libdl.
-demo_LIBS = -ldl
+demo_LDFLAGS = -ldl
+endif