X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-nevents%2FMakefile.am;h=c20910bd87e91721480d0d22f65b5192cf30f5f2;hp=24f64b2c6ed204a3cf1bdcd242bc8ec91c62e30e;hb=20dd2de1fa1efe1519d1b6e88386efa89d60d1b9;hpb=343af227102f6b274bfd7f6c7220eb3b776ba5e3

diff --git a/tests/utils/testapp/gen-ust-nevents/Makefile.am b/tests/utils/testapp/gen-ust-nevents/Makefile.am
index 24f64b2c6..c20910bd8 100644
--- a/tests/utils/testapp/gen-ust-nevents/Makefile.am
+++ b/tests/utils/testapp/gen-ust-nevents/Makefile.am
@@ -1,15 +1,10 @@
-AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/tests/utils
-
-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
 noinst_PROGRAMS = gen-ust-nevents
 gen_ust_nevents_SOURCES = gen-ust-nevents.c tp.c tp.h
-gen_ust_nevents_LDADD = -llttng-ust -lurcu-bp \
-		$(top_builddir)/tests/utils/libtestutils.la
+gen_ust_nevents_LDADD = $(UST_LIBS) \
+		$(top_builddir)/tests/utils/libtestutils.la \
+		$(DL_LIBS)
 endif