projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gcc warning fix: -Wextra
[babeltrace.git]
/
converter
/
Makefile.am
diff --git
a/converter/Makefile.am
b/converter/Makefile.am
index 2622e9ca67a00a90738f247747539fd14411bb52..3248d443fa1d92acd7904706e6585bac0395b1d8 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
@@
-12,14
+13,17
@@
babeltrace_LDFLAGS = -Wl,--no-as-needed
babeltrace_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
babeltrace_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+ $(top_builddir)/compat/libcompat.la \
$(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.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
babeltrace_log_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la
babeltrace_log_SOURCES = babeltrace-log.c
babeltrace_log_LDADD = \
$(top_builddir)/lib/libbabeltrace.la \
- $(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \
+ $(top_builddir)/compat/libcompat.la
if BABELTRACE_BUILD_WITH_LIBUUID
babeltrace_log_LDADD += -luuid
if BABELTRACE_BUILD_WITH_LIBUUID
babeltrace_log_LDADD += -luuid
@@
-27,3
+31,8
@@
endif
if BABELTRACE_BUILD_WITH_LIBC_UUID
babeltrace_log_LDADD += -lc
endif
if BABELTRACE_BUILD_WITH_LIBC_UUID
babeltrace_log_LDADD += -lc
endif
+
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_log_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+babeltrace_LDADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt -lpthread
+endif
This page took
0.023695 seconds
and
4
git commands to generate.