X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2FMakefile.am;fp=src%2Fbin%2Flttng-sessiond%2FMakefile.am;h=bc99f9b4a4e8d660fe9680e2543ee4dd12d32740;hb=de003c688dc5a05650a45a2fa2b8e946b9aac61b;hp=8748dd6bb915d6f8420872500c87661b9500f316;hpb=0e4cbe7e2c4c6a8343e710a3b050af8c33f95e21;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index 8748dd6bb..bc99f9b4a 100644
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -1,4 +1,6 @@
-AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+<<<<<<< HEAD
+AM_CPPFLAGS = -I$(top_srcdir)/benchmark \
+			  -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
 			  -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
 AM_CFLAGS = -fno-strict-aliasing
@@ -33,7 +35,8 @@ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
 		$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
 		$(top_builddir)/src/common/hashtable/libhashtable.la \
 		$(top_builddir)/src/common/libcommon.la \
-		$(top_builddir)/src/common/compat/libcompat.la
+		$(top_builddir)/src/common/compat/libcompat.la \
+		$(top_builddir)/benchmark/liblttng-benchmark.la
 
 if HAVE_LIBLTTNG_UST_CTL
 lttng_sessiond_LDADD += -llttng-ust-ctl