X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2FMakefile.am;h=4c23849cf85af96e8144684a4202c64e98be4563;hp=17dc58747735cc0bbadb1e8538cc243f44671e61;hb=48842b309b2000205367409c0f29ca40ec3e251c;hpb=059008c7017e1148c77e4ec7050227f80300c5bd

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index 17dc58747..4c23849cf 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -1,15 +1,45 @@
-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/compat-epoll.c
+else
+COMPAT=compat/compat-poll.c
+endif
 
-ltt_sessiond_LDADD = \
-		 $(top_builddir)/liblttsessiondcomm/liblttsessiondcomm.la \
+ltt_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 \
+                       ust-ctl.h ust-app.h trace-ust.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 \
+                       ../hashtable/rculfhash.c \
+                       ../hashtable/rculfhash.h \
+                       ../hashtable/hash.c ../hashtable/hash.h
+
+if LTTNG_TOOLS_HAVE_UST
+ltt_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
+endif
+
+# Add main.c at the end for compile order
+ltt_sessiond_SOURCES += ltt-sessiond.h main.c
+
+# link on liblttngctl for check if sessiond is already alive.
+ltt_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
+		 $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
 		 $(top_builddir)/libkernelctl/libkernelctl.la \
-		 $(top_builddir)/libustctl/libustctl.la
+		 $(top_builddir)/liblttngctl/liblttngctl.la
+
+if LTTNG_TOOLS_HAVE_UST
+ltt_sessiond_LDADD += -llttng-ust-comm -lustctl
+endif