Don't depend on $(zip_LIBS), just link it in.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 67b36a510a1230d639f18c08af7a7ba85797f03a..fb1a8b0a7b852ba650ca41c4e286dfeb69560cf2 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-08  Roland McGrath  <roland@redhat.com>
+
+       * Makefile.am (libdw.so): Don't depend on $(zip_LIBS), just link it in.
+
 2009-01-06  Roland McGrath  <roland@redhat.com>
 
        * Makefile.am (libdw.so): Link in $(zip_LIBS).

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 8649395acbf888b0296e600c709feeced470955e..56c7a2ffebd24ef463e43d8d3ec4e2a4898f5044 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -92,14 +92,14 @@ 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 \
-         ../libelf/libelf.so $(zip_LIBS)
+         ../libelf/libelf.so
 # The rpath is necessary for libebl because its $ORIGIN use will
 # not fly in a setuid executable that links in libdw.
        $(LINK) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
                -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
                -Wl,--version-script,$<,--no-undefined \
                -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
-               -ldl
+               -ldl $(zip_LIBS)
        if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
        ln -fs $@ $@.$(VERSION)