X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2FMakefile.am;h=b473d5c62b29463eb449bc7ee096ae9a96ab672b;hp=df87bc3005311d6b297d3680d1d7fe06306d914c;hb=HEAD;hpb=d30b2041e3a5db2d1671219ea845057cb3dd3082

diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am
index df87bc300..fce8c2346 100644
--- a/src/bin/lttng-relayd/Makefile.am
+++ b/src/bin/lttng-relayd/Makefile.am
@@ -1,35 +1,38 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-			  -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
-			  -DINSTALL_LIB_PATH=\""$(libdir)"\"
+# SPDX-License-Identifier: GPL-2.0-only
 
-AM_CFLAGS = -fno-strict-aliasing
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(lttnglibexecdir)"\" \
+	-DINSTALL_LIB_PATH=\""$(libdir)"\"
+
+if EMBED_HELP
+AM_CPPFLAGS += -I$(top_builddir)/doc/man
+endif
 
 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 \
-                       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 \
-                       health-relayd.c health-relayd.h \
-                       lttng-viewer-abi.h testpoint.h \
-                       viewer-stream.h viewer-stream.c \
-                       session.c session.h \
-                       stream.c stream.h \
-                       stream-fd.c stream-fd.h \
-                       connection.c connection.h \
-                       viewer-session.c viewer-session.h \
-                       tracefile-array.c tracefile-array.h
+lttng_relayd_SOURCES = main.cpp lttng-relayd.hpp utils.hpp utils.cpp cmd.hpp \
+                       index.cpp index.hpp live.cpp live.hpp ctf-trace.cpp ctf-trace.hpp \
+                       cmd-2-1.cpp cmd-2-1.hpp \
+                       cmd-2-2.cpp cmd-2-2.hpp \
+                       cmd-2-4.cpp cmd-2-4.hpp \
+                       cmd-2-11.cpp cmd-2-11.hpp \
+                       health-relayd.cpp health-relayd.hpp \
+                       lttng-viewer-abi.hpp testpoint.hpp \
+                       viewer-stream.hpp viewer-stream.cpp \
+                       session.cpp session.hpp \
+                       stream.cpp stream.hpp \
+                       connection.cpp connection.hpp \
+                       viewer-session.cpp viewer-session.hpp \
+                       tracefile-array.cpp tracefile-array.hpp \
+                       tcp_keep_alive.cpp tcp_keep_alive.hpp \
+                       sessiond-trace-chunks.cpp sessiond-trace-chunks.hpp \
+                       backward-compatibility-group-by.cpp backward-compatibility-group-by.hpp \
+                       thread-utils.cpp
 
 # link on liblttngctl for check if relayd is already alive.
-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/compat/libcompat.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/lib/lttng-ctl/liblttng-ctl.la
+lttng_relayd_LDADD = $(URCU_LIBS) \
+		$(top_builddir)/src/common/libcommon-gpl.la \
+		$(top_builddir)/src/common/libsessiond-comm.la \
+		$(top_builddir)/src/common/libcompat.la \
+		$(top_builddir)/src/common/libindex.la \
+		$(top_builddir)/src/common/libhealth.la \
+		$(top_builddir)/src/common/libtestpoint.la