diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-28 21:29:22 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-28 21:29:22 +0000 |
| commit | 18618fd74777576cc20dce341bb71be327f9ed48 (patch) | |
| tree | 13b84bfdcc11d179f64a409472b6a23513325071 /libdw | |
| parent | d07fc4b6d39599a2300708e9abbc71b72608930b (diff) | |
| download | android_external_elfutils-18618fd74777576cc20dce341bb71be327f9ed48.tar.gz android_external_elfutils-18618fd74777576cc20dce341bb71be327f9ed48.tar.bz2 android_external_elfutils-18618fd74777576cc20dce341bb71be327f9ed48.zip | |
Merge all of libdwfl.a into libdw.a. libdwfl.a is not installed.
Fix building of libdwfl. libdwfl.a must not depend on libwu.a
since the latter is not available after installation. Add copies
of the crc32 files to libdwfl.
Diffstat (limited to 'libdw')
| -rw-r--r-- | libdw/ChangeLog | 5 | ||||
| -rw-r--r-- | libdw/Makefile.am | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 3ec3b65c..85f12c4e 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,8 @@ +2005-07-28 Ulrich Drepper <drepper@redhat.com> + + * Makefile.am (libdw.so): No need to link with libeu.a anymore. + (libdw_a_LIBADD): Add all files from libdwfl.a. + 2005-07-27 Roland McGrath <roland@redhat.com> * Makefile.am (libdw.so): Link ../libdwfl/libdwfl_pic.a in, diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 92ca9418..097ec3a2 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -72,7 +72,7 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) libdw_so_SOURCES = libdw.so: $(srcdir)/libdw.map libdw_pic.a \ - ../libdwfl/libdwfl_pic.a ../libebl/libebl.a ../lib/libeu.a \ + ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \ ../libelf/libelf.so $(CC) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \ -Wl,--version-script,$<,--no-undefined \ @@ -81,7 +81,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.a \ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) - %.os: %.c %.o if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \ -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -103,6 +102,8 @@ uninstall: uninstall-am rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils endif +libdw_a_LIBADD = $(addprefix ../libdwfl/,$(shell $(AR) t ../libdwfl/libdwfl.a)) + noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h EXTRA_DIST = libdw.map |