X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-nevents%2FMakefile.am;h=746ffc688cee6d3593bbf9701f3564b493716544;hb=4e845c10b7b0549cdd0ad400509454399150c061;hp=e11b5f36f34fb8ff22c1eb0aa760cbb2885ad8c0;hpb=ffb08a8cbd7c40e4ca15622f88dca18f0790fddf;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am
index e11b5f36f..746ffc688 100644
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/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
-AM_LDFLAGS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -lc
-endif
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils \
+	-I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
+WARN_FLAGS = \
+	-Wno-redundant-decls \
+	-Wno-missing-field-initializers
+
+AM_CFLAGS += $(WARN_FLAGS)
+AM_CXXFLAGS += $(WARN_FLAGS)
+
 noinst_PROGRAMS = gen-ust-nevents
-gen_ust_nevents_SOURCES = gen-ust-nevents.c tp.c tp.h
-gen_ust_nevents_LDADD = -llttng-ust
+gen_ust_nevents_SOURCES = \
+	gen-ust-nevents.cpp \
+	tp.c \
+	tp.h
+gen_ust_nevents_LDADD = $(UST_LIBS) \
+		$(top_builddir)/tests/utils/libtestutils.la \
+		$(DL_LIBS)
 endif