X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2FMakefile.am;h=e1b42ca09ef6699ed46f31716417d74a55a47b2a;hp=17dc58747735cc0bbadb1e8538cc243f44671e61;hb=71615260f4e0d7a58bf64a837c081af2d155ef9d;hpb=059008c7017e1148c77e4ec7050227f80300c5bd

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 17dc58747..e1b42ca09 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,15 +1,34 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttsessiondcomm \
-			  -I$(top_srcdir)/libkernelctl -I$(top_srcdir)/libustctl \
-			  -DINSTALL_BIN_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-epoll.c
+else
+COMPAT=compat-poll.c
+endif
 
-ltt_sessiond_LDADD = \
-		 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \
+ltt_sessiond_SOURCES = utils.c utils.h \
+                       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 \
+                       futex.c futex.h \
+                       shm.c shm.h \
+                       poll.h \
+                       $(COMPAT) \
+                       session.c session.h \
+                       ltt-sessiond.h main.c
+
+# 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