From: Roland McGrath <roland@redhat.com>
Date: Thu, 8 Jan 2009 21:39:08 +0000 (-0800)
Subject: Don't depend on $(zip_LIBS), just link it in.
X-Git-Tag: elfutils-0.139~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06762c31cdc3c5dcabe586e613984bbe9ae6284;p=thirdparty%2Felfutils.git

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

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 67b36a510..fb1a8b0a7 100644
--- 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 8649395ac..56c7a2ffe 100644
--- 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)