diff options
| author | Roland McGrath <[email protected]> | 2006-03-09 23:05:47 +0000 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2006-03-09 23:05:47 +0000 |
| commit | dd7e22b4a0e47dfab08a14e7fa9bd1fa8b1a968c (patch) | |
| tree | df330ff6aeba8e2435583f9a5770e7ef675b9b1d | |
| parent | 060fa05452f821a1c2e15b6a9ad1a4427e3fdd64 (diff) | |
src/
2006-03-09 Roland McGrath <[email protected]>
* Makefile.am (AM_LDFLAGS): New variable.
tests/
2006-03-09 Roland McGrath <[email protected]>
* Makefile.am (AM_LDFLAGS): Define to pass -rpath-link.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
4 files changed, 15 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3a0ebf14..7690af43 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-03-09 Roland McGrath <[email protected]> + + * Makefile.am (AM_LDFLAGS): New variable. + 2006-03-01 Roland McGrath <[email protected]> * readelf.c (dwarf_tag_string, dwarf_attr_string): Update name tables diff --git a/src/Makefile.am b/src/Makefile.am index 1a489497..31de14e8 100644 --- 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 67a8ad64..bccd736c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2006-03-09 Roland McGrath <[email protected]> + + * Makefile.am (AM_LDFLAGS): Define to pass -rpath-link. + 2006-03-01 Roland McGrath <[email protected]> * show-die-info.c (tagnames, attrs): Update name tables for dwarf.h diff --git a/tests/Makefile.am b/tests/Makefile.am index d121dea6..92881094 100644 --- 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 |