X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2FMakefile.am;h=6ee9fa48f9382be23f675382d091488a9a746181;hb=fa68aa62ac4200144504075ef9186e961df2c263;hp=9134a3e95cd7cf85bd2fad0c6018dc45d6f1cf31;hpb=3f5fa9ed7f1b26c152c7702a81ef77a40a2f1372;p=lttng-tools.git

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 9134a3e95..6ee9fa48f 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,16 +1,36 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm \
-			  -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl
-
-INCLUDES = -DINSTALL_PATH=\""$(bindir)"\"
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+			  -DINSTALL_BIN_PATH=\""$(bindir)"\"
 
 AM_CFLAGS = -fno-strict-aliasing
 
 bin_PROGRAMS = ltt-sessiond
 
-ltt_sessiond_SOURCES = utils.c trace.c session.c traceable-app.c ust-ctl.c kernel-ctl.c main.c \
-                       utils.h trace.h session.h traceable-app.h ust-ctl.h kernel-ctl.h ltt-sessiond.h
+if COMPAT_EPOLL
+COMPAT=compat/compat-epoll.c
+else
+COMPAT=compat/compat-poll.c
+endif
+
+ltt_sessiond_SOURCES = utils.c utils.h \
+                       compat/poll.h $(COMPAT) \
+                       trace-kernel.c trace-kernel.h \
+                       trace-ust.c trace-ust.h \
+                       traceable-app.c traceable-app.h \
+                       ust-comm.c ust-comm.h \
+                       ust-ctl.c ust-ctl.h \
+                       kernel-ctl.c kernel-ctl.h \
+                       context.c context.h \
+                       channel.c channel.h \
+                       event.c event.h \
+                       futex.c futex.h \
+                       shm.c shm.h \
+                       session.c session.h \
+                       ltt-sessiond.h main.c \
+                       ../hashtable/rculfhash.c
 
-ltt_sessiond_LDADD = \
-		 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \
+# link on liblttngctl for check if sessiond is already alive.
+ltt_sessiond_LDADD = -lrt \
+		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
-		 $(top_builddir)/libustctl/libustctl.la
+		 $(top_builddir)/libustctl/libustctl.la	\
+		 $(top_builddir)/liblttngctl/liblttngctl.la