X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2FMakefile.am;h=11fb85e0b0968d69feca5682258ae18a5a002393;hb=3a2434036c2e836d58bfa5b89ba47b5898d86d35;hp=e71c1081443744445bbdeed89895c75c94979593;hpb=b7fc068d873bcfc93761f418bfefe8c928c33a59;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index e71c10814..11fb85e0b 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/Makefile.am @@ -7,12 +7,12 @@ if EMBED_HELP AM_CPPFLAGS += -I$(top_builddir)/doc/man endif -bin_PROGRAMS = lttng-sessiond +noinst_LTLIBRARIES = liblttng-sessiond-common.la -lttng_sessiond_SOURCES = utils.c utils.h \ +liblttng_sessiond_common_la_SOURCES = utils.c utils.h \ trace-kernel.c trace-kernel.h \ kernel.c kernel.h \ - ust-app.h trace-ust.h notify-apps.h \ + ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \ lttng-ust-ctl.h lttng-ust-abi.h lttng-ust-error.h \ ust-ctl-internal.h ust-abi-internal.h ust-error-internal.h \ ust-registry.h \ @@ -55,20 +55,20 @@ lttng_sessiond_SOURCES = utils.c utils.h \ manage-consumer.c manage-consumer.h \ clear.c clear.h \ tracker.c tracker.h \ - action-executor.c action-executor.h + event-notifier-error-accounting.c event-notifier-error-accounting.h \ + action-executor.c action-executor.h\ + trigger-error-query.c if HAVE_LIBLTTNG_UST_CTL -lttng_sessiond_SOURCES += trace-ust.c ust-registry.c ust-app.c \ +liblttng_sessiond_common_la_SOURCES += trace-ust.c ust-registry.c ust-app.c \ ust-consumer.c ust-consumer.h notify-apps.c \ ust-metadata.c ust-clock.h agent-thread.c agent-thread.h \ - ust-field-utils.h ust-field-utils.c + ust-field-utils.h ust-field-utils.c \ + ust-sigbus.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 = -lurcu-common $(URCU_LIBS) $(KMOD_LIBS) \ +liblttng_sessiond_common_la_LIBADD = $(URCU_LIBS) $(KMOD_LIBS) \ $(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 \ @@ -83,5 +83,13 @@ lttng_sessiond_LDADD = -lurcu-common $(URCU_LIBS) $(KMOD_LIBS) \ if HAVE_LIBLTTNG_UST_CTL -lttng_sessiond_LDADD += $(UST_CTL_LIBS) +liblttng_sessiond_common_la_LIBADD += $(UST_CTL_LIBS) endif + +bin_PROGRAMS = lttng-sessiond + +lttng_sessiond_SOURCES = lttng-sessiond.h main.c + +lttng_sessiond_LDFLAGS = -rdynamic + +lttng_sessiond_LDADD = liblttng-sessiond-common.la