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

diff --git a/ltt-sessiond/Makefile.am b/ltt-sessiond/Makefile.am
index e1b42ca09..4c23849cf 100644
--- a/ltt-sessiond/Makefile.am
+++ b/ltt-sessiond/Makefile.am
@@ -6,29 +6,40 @@ AM_CFLAGS = -fno-strict-aliasing
 bin_PROGRAMS = ltt-sessiond
 
 if COMPAT_EPOLL
-COMPAT=compat-epoll.c
+COMPAT=compat/compat-epoll.c
 else
-COMPAT=compat-poll.c
+COMPAT=compat/compat-poll.c
 endif
 
 ltt_sessiond_SOURCES = utils.c utils.h \
+                       hashtable.c hashtable.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 \
+                       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 \
-                       poll.h \
-                       $(COMPAT) \
                        session.c session.h \
-                       ltt-sessiond.h main.c
+                       ../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 \
+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