projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: time redefinition warnings on macOS builds
[lttng-tools.git]
/
src
/
common
/
Makefile.am
diff --git
a/src/common/Makefile.am
b/src/common/Makefile.am
index 8633730a92b102baee5ee59f8b5b226e241750d7..8619b5e25f31b627db462a128286ceb0a7872bd9 100644
(file)
--- a/
src/common/Makefile.am
+++ b/
src/common/Makefile.am
@@
-61,7
+61,7
@@
AM_CFLAGS = -fno-strict-aliasing
noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
uri.h utils.h lttng-kernel-old.h \
noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
uri.h utils.h lttng-kernel-old.h \
- align.h bitfield.h bug.h
+ align.h bitfield.h bug.h
time.h
# Common library
noinst_LTLIBRARIES = libcommon.la
# Common library
noinst_LTLIBRARIES = libcommon.la
@@
-76,9
+76,13
@@
libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
filter.c filter.h context.c context.h
libcommon_la_LIBADD = \
filter.c filter.h context.c context.h
libcommon_la_LIBADD = \
- -luuid \
- -lrt \
$(top_builddir)/src/common/config/libconfig.la
$(top_builddir)/src/common/config/libconfig.la
+if LTTNG_BUILD_WITH_LIBUUID
+libcommon_la_LIBADD += -luuid
+endif
+if LTTNG_BUILD_WITH_LIBC_UUID
+libcommon_la_LIBADD += -lc
+endif
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
This page took
0.026416 seconds
and
5
git commands to generate.