X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2FMakefile.am;h=27896e13665af420e83dadb68ad131164812ef1b;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=0cc7575d7cd0b6c96d9f8f1008caf6d66b9920cc;hpb=ae941114b338a4e6afb683345ee5f4fcc4296e01;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 0cc7575d7..27896e136 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -1,16 +1,23 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-		-I$(top_srcdir)/tests/utils -I$(srcdir) -O2 -g
+# SPDX-License-Identifier: GPL-2.0-only
 
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
-endif
+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 = -llttng-ust -lurcu-bp \
-		$(top_builddir)/tests/utils/libtestutils.la
+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