Merge branch 'master' of git://git.lttng.org/lttng-tools

[lttng-tools.git] / liblttng-consumer / Makefile.am

diff --git a/liblttng-consumer/Makefile.am b/liblttng-consumer/Makefile.am
index e3aa02a223b86dec4d4c5d01d02a2ba25256e8ae..aadba52b5067dbbaed915671ec755ef4b712bfa2 100644 (file)
--- a/liblttng-consumer/Makefile.am
+++ b/liblttng-consumer/Makefile.am
@@ -6,10 +6,10 @@ liblttng_consumer_la_SOURCES = lttng-consumer.c
 
 liblttng_consumer_la_LIBADD = \
                $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
-               $(top_builddir)/liblttng-kconsumer/liblttng-kconsumer.la
+               $(top_builddir)/liblttng-kconsumer/liblttng-kconsumer.la \
+               $(top_builddir)/liblttng-ht/liblttng-ht.la
 
-
-if LTTNG_TOOLS_HAVE_UST
+if HAVE_LIBLTTNG_UST_CTL
 liblttng_consumer_la_LIBADD += \
                $(top_builddir)/liblttng-ustconsumer/liblttng-ustconsumer.la
 endif