projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ctf-text should link on libbabeltrace-ctf
[babeltrace.git]
/
converter
/
Makefile.am
diff --git
a/converter/Makefile.am
b/converter/Makefile.am
index 389a9d98a84c8fe4e851334533266b443693f448..de70313e3273463dc8085d6980d9be187dc66a53 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
@@
-13,6
+14,7
@@
babeltrace_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \
+ $(top_builddir)/formats/ctf-metadata/libbabeltrace-ctf-metadata.la \
$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
babeltrace_log_SOURCES = babeltrace-log.c
$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
babeltrace_log_SOURCES = babeltrace-log.c
@@
-20,3
+22,10
@@
babeltrace_log_SOURCES = babeltrace-log.c
babeltrace_log_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
babeltrace_log_LDADD = \
$(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.024629 seconds
and
4
git commands to generate.