X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2FMakefile.am;h=27896e13665af420e83dadb68ad131164812ef1b;hb=1c9a0b0e83c7e073c4e576c0bed95de335b0e502;hp=d6327d5b22d16498765e2e60cd31769857f15667;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;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 d6327d5b2..27896e136 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -4,9 +4,20 @@ 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 \
+	-Wno-missing-field-initializers
+
+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) -lurcu-bp \
+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