Change linking libs using new UST names

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/liblttng-ustconsumer/Makefile.am b/liblttng-ustconsumer/Makefile.am
index c181a47cf5ea3f49f7feb8f31b181b3648ec517f..1816fef4e146fc8e34e6ca130ee35302369c5dd4 100644 (file)
--- a/liblttng-ustconsumer/Makefile.am
+++ b/liblttng-ustconsumer/Makefile.am
@@ -5,6 +5,5 @@ noinst_LTLIBRARIES = liblttng-ustconsumer.la
 
 liblttng_ustconsumer_la_SOURCES = lttng-ustconsumer.c
 
 
 liblttng_ustconsumer_la_SOURCES = lttng-ustconsumer.c
 

-liblttng_ustconsumer_la_LIBADD = \
-               -lustctl
+liblttng_ustconsumer_la_LIBADD = -llttng-ust-ctl

 endif
 endif

diff --git a/lttng-consumerd/Makefile.am b/lttng-consumerd/Makefile.am
index 2c1d56419082ca5bd34c2d2eecefa19c7c1fafe3..9ce0baef611296504b48733920aa72fe0692b97b 100644 (file)
--- a/lttng-consumerd/Makefile.am
+++ b/lttng-consumerd/Makefile.am
@@ -10,5 +10,5 @@ lttng_consumerd_LDADD = \
           $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la
 
 if LTTNG_TOOLS_HAVE_UST
           $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la
 
 if LTTNG_TOOLS_HAVE_UST

-lttng_consumerd_LDADD += -lustctl
+lttng_consumerd_LDADD += -llttng-ust-ctl

 endif
 endif

diff --git a/lttng-sessiond/Makefile.am b/lttng-sessiond/Makefile.am
index 78179bd7abae946d5692620a56e809dda17b5119..52659f4afb916b912fee6cb50f9706a907e2a3a2 100644 (file)
--- a/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@ -41,5 +41,5 @@ lttng_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
                 $(top_builddir)/liblttngctl/liblttngctl.la
 
 if LTTNG_TOOLS_HAVE_UST
                 $(top_builddir)/liblttngctl/liblttngctl.la
 
 if LTTNG_TOOLS_HAVE_UST

-lttng_sessiond_LDADD += -llttng-ust-comm -lustctl
+lttng_sessiond_LDADD += -llttng-ust-comm -llttng-ust-ctl

 endif
 endif