projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into benchmark
[lttng-tools.git]
/
lttng-sessiond
/
Makefile.am
diff --git
a/lttng-sessiond/Makefile.am
b/lttng-sessiond/Makefile.am
index 5ccb5acffd8ed2636793a2cd5cb7023148e2e8ca..829f9abb03bf58012ec4b5bf87933effdc8b8c48 100644
(file)
--- a/
lttng-sessiond/Makefile.am
+++ b/
lttng-sessiond/Makefile.am
@@
-1,5
+1,6
@@
-AM_CPPFLAGS = -I$(top_srcdir)/include \
- -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/benchmark \
+ -DINSTALL_BIN_PATH=\""$(bindir)"\" \
+ -DINSTALL_LIB_PATH=\""$(libdir)"\"
AM_CFLAGS = -fno-strict-aliasing
AM_CFLAGS = -fno-strict-aliasing
@@
-12,10
+13,9
@@
COMPAT=compat/compat-poll.c
endif
lttng_sessiond_SOURCES = utils.c utils.h \
endif
lttng_sessiond_SOURCES = utils.c utils.h \
- hashtable.c hashtable.h \
compat/poll.h $(COMPAT) \
trace-kernel.c trace-kernel.h \
compat/poll.h $(COMPAT) \
trace-kernel.c trace-kernel.h \
- kernel
-ctl.c kernel-ct
l.h \
+ kernel
.c kerne
l.h \
ust-ctl.h ust-app.h trace-ust.h \
context.c context.h \
channel.c channel.h \
ust-ctl.h ust-app.h trace-ust.h \
context.c context.h \
channel.c channel.h \
@@
-23,9
+23,7
@@
lttng_sessiond_SOURCES = utils.c utils.h \
futex.c futex.h \
shm.c shm.h \
session.c session.h \
futex.c futex.h \
shm.c shm.h \
session.c session.h \
- ../hashtable/rculfhash.c \
- ../hashtable/rculfhash.h \
- ../hashtable/hash.c ../hashtable/hash.h
+ lttng-ust-ctl.h lttng-ust-abi.h
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_SOURCES += trace-ust.c ust-app.c ust-consumer.c ust-consumer.h
@@
-38,7
+36,10
@@
lttng_sessiond_SOURCES += lttng-sessiond.h main.c
lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
$(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
$(top_builddir)/libkernelctl/libkernelctl.la \
lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \
$(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \
$(top_builddir)/libkernelctl/libkernelctl.la \
- $(top_builddir)/liblttngctl/liblttngctl.la
+ $(top_builddir)/liblttngctl/liblttngctl.la \
+ $(top_builddir)/benchmark/liblttng-benchmark.la \
+ $(top_builddir)/common/libcommon.la \
+ $(top_builddir)/liblttng-ht/liblttng-ht.la
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
if HAVE_LIBLTTNG_UST_CTL
lttng_sessiond_LDADD += -llttng-ust-ctl
This page took
0.028231 seconds
and
4
git commands to generate.