X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events%2FMakefile.am;h=8918fc80d56cc6eca9fadd3a7acc9dc4e7c43202;hb=bcf66e7d327496653738061614900f9828553432;hp=0e726d11cedb97b448ebacb71e174ca7e95bea9c;hpb=32f754b34658ed4bda092acc56ec3cdb28e4fe98;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 0e726d11c..8918fc80d 100644
--- a/tests/utils/testapp/gen-ust-events/Makefile.am
+++ b/tests/utils/testapp/gen-ust-events/Makefile.am
@@ -1,15 +1,10 @@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) -O2 -g
-AM_LDFLAGS =
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-AM_LDFLAGS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -lc
-endif
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(srcdir) \
+	-I$(top_srcdir)/tests/utils/testapp
 
 if HAVE_LIBLTTNG_UST_CTL
 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_LDADD = $(UST_LIBS) -lurcu-bp \
+		$(top_builddir)/tests/utils/libtestutils.la \
+		$(DL_LIBS)
 endif