X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2FMakefile.am;h=04f5cf4a31f27a7063699dbc59de0b416d81ec4a;hb=c92af2a5fd6587a03f1a0e927fd734751032b3a1;hp=ae8b6eb1e476ef8310a75ee473fa7cbba3afd502;hpb=0b2dc8df2a6d7b3341a72a04767dd6328907c97c;p=deliverable%2Flttng-tools.git diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index ae8b6eb1e..04f5cf4a3 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/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 @@ -22,22 +21,29 @@ lttng_sessiond_SOURCES = utils.c utils.h \ fd-limit.c fd-limit.h \ kernel-consumer.c kernel-consumer.h \ consumer.h \ - health.c health.h \ + health-sessiond.h \ cmd.c cmd.h \ buffer-registry.c buffer-registry.h \ - testpoint.h ht-cleanup.c + testpoint.h ht-cleanup.c ht-cleanup.h \ + snapshot.c snapshot.h \ + agent.c agent.h \ + save.h save.c \ + load-session-thread.h load-session-thread.c \ + syscall.h syscall.c \ + tracker.c tracker.h if HAVE_LIBLTTNG_UST_CTL lttng_sessiond_SOURCES += trace-ust.c ust-registry.c ust-app.c \ ust-consumer.c ust-consumer.h ust-thread.c \ - ust-metadata.c ust-clock.h + ust-metadata.c ust-clock.h agent-thread.c agent-thread.h \ + ust-field-utils.h ust-field-utils.c endif # Add main.c at the end for compile order lttng_sessiond_SOURCES += lttng-sessiond.h main.c # link on liblttngctl for check if sessiond is already alive. -lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \ +lttng_sessiond_LDADD = -lurcu-common -lurcu \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \ @@ -45,7 +51,10 @@ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/src/common/compat/libcompat.la \ $(top_builddir)/src/common/relayd/librelayd.la \ - $(top_builddir)/src/common/testpoint/libtestpoint.la + $(top_builddir)/src/common/testpoint/libtestpoint.la \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/config/libconfig.la + if HAVE_LIBLTTNG_UST_CTL lttng_sessiond_LDADD += -llttng-ust-ctl