projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Subdirectory handling for lttng and sessiond
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
Makefile.am
diff --git
a/src/bin/lttng-sessiond/Makefile.am
b/src/bin/lttng-sessiond/Makefile.am
index e824d4939105d135f2b9603c6aa255abde70827d..de5a252caddb17a8f476883d279d30c1e67fe4e4 100644
(file)
--- a/
src/bin/lttng-sessiond/Makefile.am
+++ b/
src/bin/lttng-sessiond/Makefile.am
@@
-1,29
+1,26
@@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(bindir)"\" \
+AM_CPPFLAGS = -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
-DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
bin_PROGRAMS = lttng-sessiond
-DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
bin_PROGRAMS = lttng-sessiond
-if COMPAT_EPOLL
-COMPAT=compat/compat-epoll.c
-else
-COMPAT=compat/compat-poll.c
-endif
-
lttng_sessiond_SOURCES = utils.c utils.h \
lttng_sessiond_SOURCES = utils.c utils.h \
- compat/poll.h $(COMPAT) \
trace-kernel.c trace-kernel.h \
kernel.c kernel.h \
ust-ctl.h ust-app.h trace-ust.h \
context.c context.h \
channel.c channel.h \
event.c event.h \
trace-kernel.c trace-kernel.h \
kernel.c kernel.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 \
shm.c shm.h \
+ consumer.c consumer.h \
session.c session.h \
session.c session.h \
- lttng-ust-ctl.h lttng-ust-abi.h
+ modprobe.c modprobe.h kern-modules.h \
+ lttng-ust-ctl.h lttng-ust-abi.h \
+ fd-limit.c fd-limit.h \
+ kernel-consumer.c kernel-consumer.h \
+ consumer.h filter.c filter.h \
+ health.c health.h
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
@@
-38,7
+35,9
@@
lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/common/compat/libcompat.la \
+ $(top_builddir)/src/common/relayd/librelayd.la
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
This page took
0.02567 seconds
and
5
git commands to generate.