tests: Add POPT_CFLAGS to gen-ust-events-ns and gen-ns-events

[lttng-tools.git] / tests / utils / testapp / gen-ust-events-ns / Makefile.am

diff --git a/tests/utils/testapp/gen-ust-events-ns/Makefile.am b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
index 2e3ad0747ff767f512df37fefc1515f1d177565b..1e0a80c4e09f7793b37b6a1f946f93a9bab5d989 100644 (file)
--- a/tests/utils/testapp/gen-ust-events-ns/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events-ns/Makefile.am
@@ -4,11 +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-ns
 gen_ust_events_ns_SOURCES = \
        gen-ust-events-ns.cpp \
        tp.c \
        tp.h
+gen_ust_events_ns_CPPFLAGS = $(POPT_CFLAGS) $(AM_CPPFLAGS)
 gen_ust_events_ns_LDADD = $(UST_LIBS) -llttng-ust-fork \
                $(top_builddir)/tests/utils/libtestutils.la \
                $(DL_LIBS) $(POPT_LIBS)