X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fdemo%2FMakefile.am;h=76ab5989a7c7ed18b44b2acfa055447dc518169b;hb=824a00a7baa26b73d590d7ddae8c3e71fd0c9a66;hp=e4570ff0a694d9fea50f14f5ed8e89696832e7a1;hpb=e3feda7db3de3530e7c9c511536c36cccf317013;p=lttng-ust.git

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index e4570ff0..76ab5989 100644
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -1,11 +1,15 @@
 # -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 built static by default
 FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
@@ -41,3 +45,4 @@ if LTTNG_UST_BUILD_WITH_LIBC_DL
 demo_LDADD = -lc
 endif
 
+endif