projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce libcommon-lgpl for liblttng-ctl
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
Makefile.am
diff --git
a/src/bin/lttng-sessiond/Makefile.am
b/src/bin/lttng-sessiond/Makefile.am
index d0033a01924b20dae84a7f90bec1eff9d1460080..4ea50e400dc5b6c9104b11a1ec35f09e89fb3e93 100644
(file)
--- a/
src/bin/lttng-sessiond/Makefile.am
+++ b/
src/bin/lttng-sessiond/Makefile.am
@@
-7,9
+7,9
@@
if EMBED_HELP
AM_CPPFLAGS += -I$(top_builddir)/doc/man
endif
AM_CPPFLAGS += -I$(top_builddir)/doc/man
endif
-bin_PROGRAMS = lttng-sessiond
+noinst_LTLIBRARIES = liblttng-sessiond-common.la
-l
ttng_sessiond
_SOURCES = utils.c utils.h \
+l
iblttng_sessiond_common_la
_SOURCES = utils.c utils.h \
trace-kernel.c trace-kernel.h \
kernel.c kernel.h \
ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \
trace-kernel.c trace-kernel.h \
kernel.c kernel.h \
ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \
@@
-59,26
+59,20
@@
lttng_sessiond_SOURCES = utils.c utils.h \
action-executor.c action-executor.h\
trigger-error-query.c
action-executor.c action-executor.h\
trigger-error-query.c
-lttng_sessiond_LDFLAGS = -rdynamic
-
if HAVE_LIBLTTNG_UST_CTL
if HAVE_LIBLTTNG_UST_CTL
-l
ttng_sessiond
_SOURCES += trace-ust.c ust-registry.c ust-app.c \
+l
iblttng_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-sigbus.c
endif
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-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.
# link on liblttngctl for check if sessiond is already alive.
-l
ttng_sessiond_LDADD = -lurcu-common
$(URCU_LIBS) $(KMOD_LIBS) \
+l
iblttng_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 \
$(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 \
- $(top_builddir)/src/common/hashtable/libhashtable.la \
- $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/common/libcommon-gpl.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/compat/libcompat.la \
$(top_builddir)/src/common/relayd/librelayd.la \
$(top_builddir)/src/common/testpoint/libtestpoint.la \
@@
-88,5
+82,13
@@
lttng_sessiond_LDADD = -lurcu-common $(URCU_LIBS) $(KMOD_LIBS) \
if HAVE_LIBLTTNG_UST_CTL
if HAVE_LIBLTTNG_UST_CTL
-l
ttng_sessiond_LD
ADD += $(UST_CTL_LIBS)
+l
iblttng_sessiond_common_la_LIB
ADD += $(UST_CTL_LIBS)
endif
endif
+
+bin_PROGRAMS = lttng-sessiond
+
+lttng_sessiond_SOURCES = lttng-sessiond.h main.c
+
+lttng_sessiond_LDFLAGS = -rdynamic
+
+lttng_sessiond_LDADD = liblttng-sessiond-common.la
This page took
0.0251169999999999 seconds
and
4
git commands to generate.