AM_CPPFLAGS = -I$(top_srcdir)/include \
- -DINSTALL_BIN_PATH=\""$(bindir)"\"
+ -DINSTALL_BIN_PATH=\""$(bindir)"\" \
+ -DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
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 \
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
lttng_sessiond_SOURCES += lttng-sessiond.h main.c
# link on liblttngctl for check if sessiond is already alive.
-lttng_sessiond_LDADD = -lrt -lurcu-cds -lurcu \
+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)/common/libcommon.la \
+ $(top_builddir)/liblttng-ht/liblttng-ht.la
if HAVE_LIBLTTNG_UST_CTL
-lttng_sessiond_LDADD += -llttng-ust-comm -llttng-ust-ctl
+lttng_sessiond_LDADD += -llttng-ust-ctl
endif