projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CLI: Implement lttng clear session command
[lttng-tools.git]
/
tests
/
regression
/
tools
/
live
/
Makefile.am
diff --git
a/tests/regression/tools/live/Makefile.am
b/tests/regression/tools/live/Makefile.am
index 8bc213d7ccab107650ba588b82e3f1b83892c517..7a26b42cfd3ecf7b708207094a1d4548186c0398 100644
(file)
--- a/
tests/regression/tools/live/Makefile.am
+++ b/
tests/regression/tools/live/Makefile.am
@@
-1,12
+1,4
@@
-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir)
-AM_LDFLAGS =
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
-endif
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
@@
-16,8
+8,7
@@
LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
LIBHEALTH=$(top_builddir)/src/common/health/libhealth.la
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
LIBHEALTH=$(top_builddir)/src/common/health/libhealth.la
-LIVE=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
- $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
+LIVE= $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT)
$(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
$(top_builddir)/src/bin/lttng-sessiond/snapshot.$(OBJEXT)
@@
-30,9
+21,9
@@
endif
live_test_SOURCES = live_test.c
live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
live_test_SOURCES = live_test.c
live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-
$(LIBHASHTABLE) $(LIBHEALTH
) -lrt
+
$(LIBHASHTABLE) $(LIBHEALTH) $(DL_LIBS
) -lrt
live_test_LDADD += $(LIVE) \
live_test_LDADD += $(LIVE) \
-
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
+ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
This page took
0.025117 seconds
and
5
git commands to generate.