X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fhello.cxx%2FMakefile.am;h=f8a8f46df813afb8c07a45f9d7123af1f1ef7b11;hb=152ba2822ce0dc11947169d2fffe6e0a26a02573;hp=81c2a5017f1c7283a77395c05ce4fe8d9012cb89;hpb=6b79f035b5ffe3afb23ee9079d30f9fbaf7de514;p=lttng-ust.git

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