src/

2006-03-09  Roland McGrath  <roland@redhat.com>

	* Makefile.am (AM_LDFLAGS): New variable.

tests/
2006-03-09  Roland McGrath  <roland@redhat.com>

	* Makefile.am (AM_LDFLAGS): Define to pass -rpath-link.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a0ebf1..7690af4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-09  Roland McGrath  <roland@redhat.com>
+
+       * Makefile.am (AM_LDFLAGS): New variable.
+
 2006-03-01  Roland McGrath  <roland@redhat.com>
 
        * readelf.c (dwarf_tag_string, dwarf_attr_string): Update name tables

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a48949..31de14e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 ##
-## Copyright (C) 1996-2002, 2003, 2004, 2005 Red Hat, Inc.
+## Copyright (C) 1996-2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
 ##
 ## This program is Open Source software; you can redistribute it and/or
 ## modify it under the terms of the Open Software License version 1.0 as
@@ -28,6 +28,8 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
           -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
           -I$(srcdir)/../lib -I..
 
+AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw
+
 YACC = @YACC@ -d
 AM_YFLAGS = -pld
 AM_LFLAGS = -Pld -olex.yy.c

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 67a8ad6..bccd736 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-09  Roland McGrath  <roland@redhat.com>
+
+       * Makefile.am (AM_LDFLAGS): Define to pass -rpath-link.
+
 2006-03-01  Roland McGrath  <roland@redhat.com>
 
        * show-die-info.c (tagnames, attrs): Update name tables for dwarf.h

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d121dea..9288109 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,15 +23,18 @@ AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
 endif
 
+AM_LDFLAGS =
+
 if !STANDALONE
 INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
           -I$(top_srcdir)/libdwfl \
           -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
           -I$(top_srcdir)/lib -I..
+AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf
 endif !STANDALONE
 
 if TESTS_RPATH
-AM_LDFLAGS = -Wl,-rpath,$(BUILT_RPATH)
+AM_LDFLAGS += -Wl,-rpath,$(BUILT_RPATH)
 tests_rpath = yes
 else
 tests_rpath = no