From: David Goulet <david.goulet@polymtl.ca>
Date: Mon, 14 Nov 2011 17:11:17 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=c70c0ca0e8e46b29376d77b5b4483891cb33679d;hp=d80a6244b0e8dc14b2912e72e94ff0848bb52ccc

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

diff --git a/lttng-sessiond/Makefile.am b/lttng-sessiond/Makefile.am
index 15e28ce06..5ccb5acff 100644
--- a/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@ -41,5 +41,5 @@ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
 		 $(top_builddir)/liblttngctl/liblttngctl.la
 
 if HAVE_LIBLTTNG_UST_CTL
-lttng_sessiond_LDADD += -llttng-ust-comm -llttng-ust-ctl
+lttng_sessiond_LDADD += -llttng-ust-ctl
 endif