X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2FMakefile.am;h=1e89ddd67b0d8d72e47917f68a34bb2bcbea1404;hb=1970828049d051d5cb485dfab995081b4550fd2a;hp=9372423b33c8f5ef531f3f8800fba674f8000acc;hpb=d7c5433442024fc55c8e9e4299c9105ed2c961ae;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 9372423b3..1e89ddd67 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -1,15 +1,22 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) -O2 -g
-AM_LDFLAGS =
+# 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
+
+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
+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