projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tracepoint.h: replace assertion by fprintf and abort()
[lttng-ust.git]
/
liblttng-ust
/
Makefile.am
diff --git
a/liblttng-ust/Makefile.am
b/liblttng-ust/Makefile.am
index f8b334aa77aa9da1c2152f3e5bd16d09c5892361..bda7ee87d208a5dfed3077d2dbad0b78511d7ded 100644
(file)
--- a/
liblttng-ust/Makefile.am
+++ b/
liblttng-ust/Makefile.am
@@
-12,7
+12,8
@@
liblttng_ust_tracepoint_la_SOURCES = \
jhash.h \
error.h
liblttng_ust_tracepoint_la_LIBADD = \
jhash.h \
error.h
liblttng_ust_tracepoint_la_LIBADD = \
- -lurcu-bp
+ -lurcu-bp \
+ $(top_builddir)/snprintf/libustsnprintf.la
liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
@@
-20,8
+21,6
@@
liblttng_ust_runtime_la_SOURCES = \
lttng-ust-comm.c \
lttng-ust-abi.c \
lttng-probes.c \
lttng-ust-comm.c \
lttng-ust-abi.c \
lttng-probes.c \
- probes/lttng-probe-ust.c \
- probes/lttng-probe-ust.h \
lttng-context-vtid.c \
lttng-context-vpid.c \
lttng-context-pthread-id.c \
lttng-context-vtid.c \
lttng-context-vpid.c \
lttng-context-pthread-id.c \
@@
-40,8
+39,8
@@
liblttng_ust_runtime_la_SOURCES = \
compat.h \
wait.h \
jhash.h \
compat.h \
wait.h \
jhash.h \
-
error
.h \
-
lttng-ust-uuid
.h
+
lttng-ust-uuid
.h \
+
error
.h
liblttng_ust_support_la_SOURCES = \
lttng-tracer.h \
liblttng_ust_support_la_SOURCES = \
lttng-tracer.h \
@@
-49,7
+48,9
@@
liblttng_ust_support_la_SOURCES = \
ust-core.c \
lttng-ring-buffer-client.h \
lttng-ring-buffer-client-discard.c \
ust-core.c \
lttng-ring-buffer-client.h \
lttng-ring-buffer-client-discard.c \
+ lttng-ring-buffer-client-discard-rt.c \
lttng-ring-buffer-client-overwrite.c \
lttng-ring-buffer-client-overwrite.c \
+ lttng-ring-buffer-client-overwrite-rt.c \
lttng-ring-buffer-metadata-client.h \
lttng-ring-buffer-metadata-client.c
lttng-ring-buffer-metadata-client.h \
lttng-ring-buffer-metadata-client.c
@@
-69,11
+70,4
@@
liblttng_ust_la_LIBADD = \
$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
liblttng-ust-runtime.la liblttng-ust-support.la
$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
liblttng-ust-runtime.la liblttng-ust-support.la
-if LTTNG_UST_BUILD_WITH_LIBUUID
-liblttng_ust_la_LIBADD += -luuid
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_UUID
-liblttng_ust_la_LIBADD += -lc
-endif
-
liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing
liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing
This page took
0.023971 seconds
and
4
git commands to generate.