Merge branch 'master' into dev

[lttng-ust.git] / tests / hello.cxx / Makefile.am

diff --git a/tests/hello.cxx/Makefile.am b/tests/hello.cxx/Makefile.am
index 81c2a5017f1c7283a77395c05ce4fe8d9012cb89..f56f431c70f9800c74ffa37b2d63dfd4a88e9f32 100644 (file)
--- a/tests/hello.cxx/Makefile.am
+++ b/tests/hello.cxx/Makefile.am
@@ -1,8 +1,15 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.cpp tp.c ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
 
+if LTTNG_UST_BUILD_WITH_LIBDL
+hello_LDADD += -ldl
+endif
+if LTTNG_UST_BUILD_WITH_LIBC_DL
+hello_LDADD += -lc
+endif
+
 noinst_SCRIPTS = run
 EXTRA_DIST = run