diff options
Diffstat (limited to 'libdw/Makefile.am')
| -rw-r--r-- | libdw/Makefile.am | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 166e37cf..ef566399 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -31,17 +31,17 @@ include $(top_srcdir)/config/eu.am if BUILD_STATIC AM_CFLAGS += $(fpic_CFLAGS) endif -AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdwelf +AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdwelf -pthread VERSION = 1 lib_LIBRARIES = libdw.a -noinst_LIBRARIES = libdw_pic.a libdw_static_pic.a -noinst_PROGRAMS = libdw.so +noinst_LIBRARIES = libdw_pic.a +noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) include_HEADERS = dwarf.h pkginclude_HEADERS = libdw.h known-dwarf.h -libdw_a_CFLAGS = -fPIC -fvisibility=hidden $(AM_CFLAGS) +libdw_a_CFLAGS = -fPIC $(AM_CFLAGS) libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \ dwarf_getpubnames.c dwarf_getabbrev.c dwarf_tag.c \ dwarf_error.c dwarf_nextcu.c dwarf_diename.c dwarf_offdie.c \ @@ -95,25 +95,6 @@ libdw_a_SOURCES = dwarf_begin.c dwarf_begin_elf.c dwarf_end.c dwarf_getelf.c \ libdw_find_split_unit.c dwarf_cu_info.c \ dwarf_next_lines.c -# Minimal library with symbols needed by those libebl backends that we -# ship statically. This is so that e.g. strip doesn't end up bringing -# in the whole of libdw, and depending on libbz2, liblzma, etc. -libdw_static_pic_a_SOURCES = libdw_form.c dwarf_child.c dwarf_attr.c \ - dwarf_attr_integrate.c dwarf_formref_die.c dwarf_error.c \ - dwarf_tag.c dwarf_formref.c \ - dwarf_abbrev_hash.c dwarf_sig8_hash.c \ - dwarf_formudata.c libdw_findcu.c dwarf_offdie.c \ - dwarf_getabbrev.c dwarf_nextcu.c libdw_alloc.c \ - dwarf_hasattr_integrate.c dwarf_hasattr.c \ - dwarf_aggregate_size.c dwarf_siblingof.c dwarf_formsdata.c \ - dwarf_srclang.c dwarf_formflag.c dwarf_diecu.c \ - dwarf_bytesize.c dwarf_bitsize.c dwarf_peel_type.c \ - dwarf_default_lower_bound.c libdw_find_split_unit.c \ - dwarf_getalt.c dwarf_haschildren.c \ - dwarf_begin.c dwarf_begin_elf.c dwarf_end.c frame-cache.c \ - dwarf_get_units.c dwarf_formstring.c \ - ../libdwelf/dwelf_dwarf_gnu_debugaltlink.c - if MAINTAINER_MODE BUILT_SOURCES = $(srcdir)/known-dwarf.h MAINTAINERCLEANFILES = $(srcdir)/known-dwarf.h @@ -124,21 +105,16 @@ endif libdw_pic_a_SOURCES = am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) -am_libdw_static_pic_a_OBJECTS = $(libdw_static_pic_a_SOURCES:.c=.os) -libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ - ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \ - ../backends/libebl_static_pic.a \ - ../libcpu/libcpu_static_pic.a +libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \ + ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \ + ../libdwfl/libdwfl_pic.a libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so -libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) +libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread libdw_so_SOURCES = libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) -# The rpath is necessary for libebl because its $ORIGIN use will -# not fly in a setuid executable that links in libdw. $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ - -Wl,--soname,$@.$(VERSION) \ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ + -Wl,--soname,$@.$(VERSION),--enable-new-dtags \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(libdw_so_LIBS) -Wl,--no-whole-archive \ $(libdw_so_LDLIBS) @@ -163,6 +139,15 @@ libdw_a_LIBADD = $(addprefix ../libdwfl/,$(libdwfl_objects)) libdwelf_objects = $(shell $(AR) t ../libdwelf/libdwelf.a) libdw_a_LIBADD += $(addprefix ../libdwelf/,$(libdwelf_objects)) +libebl_objects = $(shell $(AR) t ../libebl/libebl.a) +libdw_a_LIBADD += $(addprefix ../libebl/,$(libebl_objects)) + +backends_objects = $(shell $(AR) t ../backends/libebl_backends.a) +libdw_a_LIBADD += $(addprefix ../backends/,$(backends_objects)) + +libcpu_objects = $(shell $(AR) t ../libcpu/libcpu.a) +libdw_a_LIBADD += $(addprefix ../libcpu/,$(libcpu_objects)) + noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h \ dwarf_sig8_hash.h cfi.h encoded-value.h |