X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-nevents-str%2FMakefile.am;h=e3a6e5cd0fee9a233378632eb172a9fe5ed45b9e;hb=206e6505316df1b86196d6582ef1e632e47d43a5;hp=405f05b74db4af7c00398dcedbad85bbf1d7bb42;hpb=343af227102f6b274bfd7f6c7220eb3b776ba5e3;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
index 405f05b74..e3a6e5cd0 100644
--- a/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents-str/Makefile.am
@@ -1,15 +1,22 @@
-AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils
+# 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$(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-str
-gen_ust_nevents_str_SOURCES = gen-ust-nevents-str.c tp.c tp.h
-gen_ust_nevents_str_LDADD = -llttng-ust -lurcu-bp \
-		$(top_builddir)/tests/utils/libtestutils.la
+gen_ust_nevents_str_SOURCES = \
+	gen-ust-nevents-str.cpp \
+	tp.c \
+	tp.h
+gen_ust_nevents_str_LDADD = $(UST_LIBS) \
+		$(top_builddir)/tests/utils/libtestutils.la \
+		$(DL_LIBS)
 endif