Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the build with slibtool #119

Open
wants to merge 1 commit into
base: stable-1.5
Choose a base branch
from
Open

Fix the build with slibtool #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions formats/ctf-text/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ libbabeltrace_ctf_text_la_LDFLAGS = \
$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION) \
types/libctf-text-types.la

libbabeltrace_ctf_text_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la \
$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
libbabeltrace_ctf_text_la_LIBADD =

if ENABLE_DEBUG_INFO
libbabeltrace_ctf_text_la_LIBADD += $(top_builddir)/lib/libdebug-info.la
Expand Down
3 changes: 1 addition & 2 deletions formats/ctf-text/types/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ libctf_text_types_la_SOURCES = \

libctf_text_types_la_LDFLAGS = $(LT_NO_UNDEFINED)

libctf_text_types_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
libctf_text_types_la_LIBADD =
1 change: 0 additions & 1 deletion formats/ctf/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ libbabeltrace_ctf_la_LDFLAGS = \
$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION)

libbabeltrace_ctf_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la \
types/libctf-types.la \
metadata/libctf-parser.la \
metadata/libctf-ast.la \
Expand Down
3 changes: 1 addition & 2 deletions formats/ctf/ir/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ libctf_ir_la_SOURCES = \

libctf_ir_la_LDFLAGS = $(LT_NO_UNDEFINED)

libctf_ir_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
libctf_ir_la_LIBADD =

if BABELTRACE_BUILD_WITH_LIBUUID
libctf_ir_la_LIBADD += -luuid
Expand Down
2 changes: 1 addition & 1 deletion formats/ctf/metadata/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ libctf_ast_la_SOURCES = ctf-visitor-xml.c \
ctf-visitor-semantic-validator.c \
ctf-visitor-generate-io-struct.c
libctf_ast_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
$(top_builddir)/types/libbabeltrace_types.la
libctf_ast_la_LDFLAGS = $(LT_NO_UNDEFINED)

if BABELTRACE_BUILD_WITH_LIBUUID
Expand Down
3 changes: 1 addition & 2 deletions formats/ctf/types/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ libctf_types_la_SOURCES = \

libctf_types_la_LDFLAGS = $(LT_NO_UNDEFINED)

libctf_types_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
libctf_types_la_LIBADD =
3 changes: 1 addition & 2 deletions formats/ctf/writer/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ libctf_writer_la_SOURCES = \
writer.c \
functor.c

libctf_writer_la_LIBADD = \
$(top_builddir)/lib/libbabeltrace.la
libctf_writer_la_LIBADD =

libctf_writer_la_LDFLAGS = $(LT_NO_UNDEFINED)

Expand Down
4 changes: 1 addition & 3 deletions lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,4 @@ libdebug_info_la_LIBADD = libbabeltrace.la
endif

libbabeltrace_la_LIBADD = \
prio_heap/libprio_heap.la \
$(top_builddir)/types/libbabeltrace_types.la \
$(top_builddir)/compat/libcompat.la
prio_heap/libprio_heap.la