From: Ulrich Drepper <drepper@myware66.akkadia.org>
Date: Thu, 23 Apr 2009 14:59:02 +0000 (-0700)
Subject: Fix building tests with mudflap.
X-Git-Tag: elfutils-0.141~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9545c4ac7ec2cf0d5b69aa2db043f9f4df6c6c5;p=thirdparty%2Felfutils.git

Fix building tests with mudflap.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 70e9c0270..f1fd512b3 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS).
+	(rdwrmmap_LDADD): Add $(libmudflap).
+	
 2009-04-21  Roland McGrath  <roland@redhat.com>
 
 	* testfile50.bz2: New data file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 81c1ab76b..9f4ccddbf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -160,7 +160,7 @@ installcheck-local:
 endif !STANDALONE
 
 if MUDFLAP
-static_build=yes
+static_build = yes
 libmudflap = -lmudflap
 endif
 
@@ -171,7 +171,7 @@ libasm = -lasm
 libebl = -lebl
 else !STANDALONE
 if BUILD_STATIC
-libdw = ../libdw/libdw.a $(libelf) $(libebl) -ldl
+libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl
 libelf = ../libelf/libelf.a
 libasm = ../libasm/libasm.a
 else
@@ -225,7 +225,7 @@ asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
 asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
 asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
 dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
-rdwrmmap_LDADD = $(libelf)
+rdwrmmap_LDADD = $(libelf) $(libmudflap)
 dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
 arls_LDADD = $(libelf) $(libmudflap)
 dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl