X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-sessiond%2FMakefile.am;h=829f9abb03bf58012ec4b5bf87933effdc8b8c48;hb=5af3d17607cbce4ab708e633986d3d41f8d56814;hp=755bee4fbc524c5dda35b059d1e56c29412e4bfd;hpb=ebaeda9495ef97ec81d9f7dd66eccdb32f116cee;p=lttng-tools.git

diff --git a/lttng-sessiond/Makefile.am b/lttng-sessiond/Makefile.am
index 755bee4fb..829f9abb0 100644
--- a/lttng-sessiond/Makefile.am
+++ b/lttng-sessiond/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/benchmark \
 			  -DINSTALL_BIN_PATH=\""$(bindir)"\" \
 			  -DINSTALL_LIB_PATH=\""$(libdir)"\"
 
@@ -13,10 +13,9 @@ COMPAT=compat/compat-poll.c
 endif
 
 lttng_sessiond_SOURCES = utils.c utils.h \
-                       hashtable.c hashtable.h \
                        compat/poll.h $(COMPAT) \
                        trace-kernel.c trace-kernel.h \
-                       kernel-ctl.c kernel-ctl.h \
+                       kernel.c kernel.h \
                        ust-ctl.h ust-app.h trace-ust.h \
                        context.c context.h \
                        channel.c channel.h \
@@ -24,9 +23,7 @@ lttng_sessiond_SOURCES = utils.c utils.h \
                        futex.c futex.h \
                        shm.c shm.h \
                        session.c session.h \
-                       ../hashtable/rculfhash.c \
-                       ../hashtable/rculfhash.h \
-                       ../hashtable/hash.c ../hashtable/hash.h
+                       lttng-ust-ctl.h lttng-ust-abi.h
 
 if HAVE_LIBLTTNG_UST_CTL
 lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
@@ -39,7 +36,10 @@ lttng_sessiond_SOURCES += lttng-sessiond.h main.c
 lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
 		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
-		 $(top_builddir)/liblttngctl/liblttngctl.la
+		 $(top_builddir)/liblttngctl/liblttngctl.la \
+		 $(top_builddir)/benchmark/liblttng-benchmark.la \
+		 $(top_builddir)/common/libcommon.la \
+		 $(top_builddir)/liblttng-ht/liblttng-ht.la
 
 if HAVE_LIBLTTNG_UST_CTL
 lttng_sessiond_LDADD += -llttng-ust-ctl