projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: allocate ts_end in ringbuffer shared memory
[lttng-ust.git]
/
liblttng-ust
/
Makefile.am
diff --git
a/liblttng-ust/Makefile.am
b/liblttng-ust/Makefile.am
index 57df3aedc9b3f04ad57c6530994e9a61609f2e57..156552806943705c954031931ea2fd888596079f 100644
(file)
--- a/
liblttng-ust/Makefile.am
+++ b/
liblttng-ust/Makefile.am
@@
-12,20
+12,16
@@
liblttng_ust_tracepoint_la_SOURCES = \
lttng-tracer-core.h \
jhash.h \
error.h
lttng-tracer-core.h \
jhash.h \
error.h
+
liblttng_ust_tracepoint_la_LIBADD = \
-lurcu-bp \
-lpthread \
liblttng_ust_tracepoint_la_LIBADD = \
-lurcu-bp \
-lpthread \
- $(top_builddir)/snprintf/libustsnprintf.la
+ $(top_builddir)/snprintf/libustsnprintf.la \
+ $(DL_LIBS)
+
liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_tracepoint_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_tracepoint_la_LIBADD += -lc
-endif
-
liblttng_ust_runtime_la_SOURCES = \
lttng-ust-comm.c \
lttng-ust-abi.c \
liblttng_ust_runtime_la_SOURCES = \
lttng-ust-comm.c \
lttng-ust-abi.c \
@@
-67,8
+63,6
@@
liblttng_ust_runtime_la_SOURCES = \
string-utils.c \
string-utils.h
string-utils.c \
string-utils.h
-liblttng_ust_runtime_la_CFLAGS = -DLTTNG_UST_LIBRARY_VERSION_MAJOR=\"$(LTTNG_UST_LIBRARY_VERSION_MAJOR)\"
-
if HAVE_PERF_EVENT
liblttng_ust_runtime_la_SOURCES += \
lttng-context-perf-counters.c \
if HAVE_PERF_EVENT
liblttng_ust_runtime_la_SOURCES += \
lttng-context-perf-counters.c \
@@
-106,13
+100,7
@@
liblttng_ust_la_LIBADD = \
$(top_builddir)/snprintf/libustsnprintf.la \
$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
liblttng-ust-tracepoint.la \
$(top_builddir)/snprintf/libustsnprintf.la \
$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
liblttng-ust-tracepoint.la \
- liblttng-ust-runtime.la liblttng-ust-support.la
-
-if LTTNG_UST_BUILD_WITH_LIBDL
-liblttng_ust_la_LIBADD += -ldl
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_DL
-liblttng_ust_la_LIBADD += -lc
-endif
+ liblttng-ust-runtime.la liblttng-ust-support.la \
+ $(DL_LIBS)
liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)
liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)
This page took
0.027377 seconds
and
4
git commands to generate.