projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into benchmark
[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 \
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
liblttng_consumer_la_LIBADD += \
$(top_builddir)/liblttng-ustconsumer/liblttng-ustconsumer.la
endif
This page took
0.062834 seconds
and
4
git commands to generate.