projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build warning: set -lpopt as LDFLAGS rather than CFLAGS
[babeltrace.git]
/
converter
/
Makefile.am
diff --git
a/converter/Makefile.am
b/converter/Makefile.am
index 578280a681e4427f8d0fd9e47b348aa0e69bef2e..482aec348a922fadf4002a63ce44f31fffb294e0 100644
(file)
--- a/
converter/Makefile.am
+++ b/
converter/Makefile.am
@@
-1,4
+1,5
@@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+AM_LDFLAGS = -lpopt
bin_PROGRAMS = babeltrace babeltrace-log
bin_PROGRAMS = babeltrace babeltrace-log
@@
-7,19
+8,23
@@
babeltrace_SOURCES = \
# -Wl,--no-as-needed is needed for recent gold linker who seems to think
# it knows better and considers libraries with constructors having
# -Wl,--no-as-needed is needed for recent gold linker who seems to think
# it knows better and considers libraries with constructors having
-# side-effects as dead code. Note: we put plugin dependencies on the
-# executable rather than the library because libtool does not seem to
-# issue the LDFLAGS before the rpaths, which makes it useless.
+# side-effects as dead code.
babeltrace_LDFLAGS = -Wl,--no-as-needed
babeltrace_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
babeltrace_LDFLAGS = -Wl,--no-as-needed
babeltrace_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
- $(top_builddir)/formats/libbabeltrace_registry.la \
- $(top_builddir)/formats/ctf/libctf.la \
- $(top_builddir)/formats/ctf-text/libctf-text.la \
- $(top_builddir)/formats/bt-dummy/libbt-dummy.la
+ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+ $(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
+ $(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
babeltrace_log_SOURCES = babeltrace-log.c
babeltrace_log_LDADD = \
babeltrace_log_SOURCES = babeltrace-log.c
babeltrace_log_LDADD = \
- $(top_builddir)/formats/libbabeltrace_registry.la \
- $(top_builddir)/formats/ctf/libctf.la
+ $(top_builddir)/lib/libbabeltrace.la \
+ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+
+if BABELTRACE_BUILD_WITH_LIBUUID
+babeltrace_log_LDADD += -luuid
+endif
+if BABELTRACE_BUILD_WITH_LIBC_UUID
+babeltrace_log_LDADD += -lc
+endif
This page took
0.025692 seconds
and
4
git commands to generate.