projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: relayd: initialize the global fd tracker from fd_cap parameter
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
Makefile.am
diff --git
a/src/bin/lttng-relayd/Makefile.am
b/src/bin/lttng-relayd/Makefile.am
index 126cdafc4b23c07dc0b0106aaf3831ffa81f6938..9fdadbcf5953e9631abb0eaa9919e0df7859e318 100644
(file)
--- a/
src/bin/lttng-relayd/Makefile.am
+++ b/
src/bin/lttng-relayd/Makefile.am
@@
-1,6
+1,5
@@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
- -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
- -DINSTALL_LIB_PATH=\""$(libdir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+ -DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
AM_CFLAGS = -fno-strict-aliasing
@@
-8,7
+7,6
@@
bin_PROGRAMS = lttng-relayd
lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \
index.c index.h live.c live.h ctf-trace.c ctf-trace.h \
lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \
index.c index.h live.c live.h ctf-trace.c ctf-trace.h \
- cmd-generic.c cmd-generic.h \
cmd-2-1.c cmd-2-1.h \
cmd-2-2.c cmd-2-2.h \
cmd-2-4.c cmd-2-4.h \
cmd-2-1.c cmd-2-1.h \
cmd-2-2.c cmd-2-2.h \
cmd-2-4.c cmd-2-4.h \
@@
-17,11
+15,14
@@
lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \
viewer-stream.h viewer-stream.c \
session.c session.h \
stream.c stream.h \
viewer-stream.h viewer-stream.c \
session.c session.h \
stream.c stream.h \
- connection.c connection.h
+ stream-fd.c stream-fd.h \
+ connection.c connection.h \
+ viewer-session.c viewer-session.h \
+ tracefile-array.c tracefile-array.h \
+ tcp_keep_alive.c tcp_keep_alive.h
# link on liblttngctl for check if relayd is already alive.
# link on liblttngctl for check if relayd is already alive.
-lttng_relayd_LDADD = -lrt -lurcu-common -lurcu \
- $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+lttng_relayd_LDADD = -lurcu-common -lurcu \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/hashtable/libhashtable.la \
$(top_builddir)/src/common/libcommon.la \
@@
-29,4
+30,6
@@
lttng_relayd_LDADD = -lrt -lurcu-common -lurcu \
$(top_builddir)/src/common/index/libindex.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
$(top_builddir)/src/common/index/libindex.la \
$(top_builddir)/src/common/health/libhealth.la \
$(top_builddir)/src/common/config/libconfig.la \
- $(top_builddir)/src/common/testpoint/libtestpoint.la
+ $(top_builddir)/src/common/testpoint/libtestpoint.la \
+ $(top_builddir)/src/common/fd-tracker/libfd-tracker.la \
+ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
This page took
0.034457 seconds
and
5
git commands to generate.