X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2FMakefile.am;h=1e89ddd67b0d8d72e47917f68a34bb2bcbea1404;hb=1970828049d051d5cb485dfab995081b4550fd2a;hp=4b1c2173bfc6e39a9be6cb2ed9a0afcf29621b65;hpb=62b7418e09fbce6c2f9ea5cf237c980a849c58fe;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-events/Makefile.am b/tests/utils/testapp/gen-ust-events/Makefile.am
index 4b1c2173b..1e89ddd67 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -4,9 +4,19 @@ 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
-gen_ust_events_SOURCES = gen-ust-events.c tp.c tp.h
-gen_ust_events_LDADD = $(UST_LIBS) $(URCU_BP_LIBS) \
+gen_ust_events_SOURCES = \
+	gen-ust-events.cpp \
+	tp.c \
+	tp.h
+gen_ust_events_LDADD = $(UST_LIBS) \
 		$(top_builddir)/tests/utils/libtestutils.la \
 		$(DL_LIBS)
 endif