X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2FMakefile.am;h=f8ba4ead6022653b64ec4608f0c6015e31c02cf0;hb=f465e9787f5b70d4a8f3761c60b8d6e4161e9628;hp=68a1f51667793d3d3e8ebbbd04ef0dbec2fc65ac;hpb=5de056160cfbe7880c6f7d4801dcc3c91730b12e;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am
index 68a1f5166..f8ba4ead6 100644
--- 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
 
@@ -8,19 +7,30 @@ 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.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 \
+                       tcp_keep_alive.c tcp_keep_alive.h \
+                       index-file.c index-file.h
 
 # 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/compat/libcompat.la \
 		$(top_builddir)/src/common/index/libindex.la \
-		$(top_builddir)/src/common/health/libhealth.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/fd-tracker/libfd-tracker.la \
+		$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la