X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events-ns%2FMakefile.am;h=37bdc94fe786f3c7bfb2e1420e40ea1377b563ca;hb=1970828049d051d5cb485dfab995081b4550fd2a;hp=39f991240912166bf2cabcbb78f8ad3311f06b9e;hpb=8a5583046c46a5b424a8997fc563e7924f0c8724;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-events-ns/Makefile.am b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
index 39f991240..37bdc94fe 100644
--- a/tests/utils/testapp/gen-ust-events-ns/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
@@ -1,10 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \
 	       -I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+# Disable some warnings flags to accomodate the tracepoint headers
+WARN_FLAGS = \
+	-Wno-redundant-decls
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-events-ns
-gen_ust_events_ns_SOURCES = gen-ust-events-ns.c tp.c tp.h
-gen_ust_events_ns_LDADD = -llttng-ust -lurcu-bp -llttng-ust-fork \
+gen_ust_events_ns_SOURCES = \
+	gen-ust-events-ns.cpp \
+	tp.c \
+	tp.h
+gen_ust_events_ns_LDADD = $(UST_LIBS) -llttng-ust-fork \
 		$(top_builddir)/tests/utils/libtestutils.la \
 		$(DL_LIBS) $(POPT_LIBS)
 endif