diff options
| author | Michael Forney <mforney@mforney.org> | 2013-11-01 00:51:05 -0700 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2013-11-05 17:28:14 +0100 |
| commit | cdc094394319969ba407e11efa06fefb31f5026b (patch) | |
| tree | 5d420962b72e379cb99da079496e2e120f3e4cea | |
| parent | a45c8043358151085633b15ea615f31f3bd680f7 (diff) | |
| download | elfutils-cdc094394319969ba407e11efa06fefb31f5026b.tar.gz | |
Fix expansion of libdw_a_LIBADD
At least with automake-1.14, libdw_a_LIBADD currently expands to:
<snip>
am__DEPENDENCIES_1 =
libdw_a_DEPENDENCIES = $(addprefix ../libdwfl/,$(shell \
$(am__DEPENDENCIES_1) t ../libdwfl/libdwfl.a))
<snip>
libdw_a_LIBADD = $(addprefix ../libdwfl/,$(shell $(AR) t ../libdwfl/libdwfl.a))
This leads to the spurious error message:
make[2]: t: Command not found
Signed-off-by: Michael Forney <mforney@mforney.org>
| -rw-r--r-- | libdw/ChangeLog | 5 | ||||
| -rw-r--r-- | libdw/Makefile.am | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 7a768fca..d4c1049d 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,5 +1,10 @@ 2013-11-01 Michael Forney <mforney@mforney.org> + * Makefile.am (libdwfl_objects): New definition. + (libdw_a_LIBADD): Use libdwfl_objects. + +2013-11-01 Michael Forney <mforney@mforney.org> + * Makefile.am: Use READELF. 2013-10-30 Jan Kratochvil <jan.kratochvil@redhat.com> diff --git a/libdw/Makefile.am b/libdw/Makefile.am index bf945608..a22166a9 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -129,7 +129,8 @@ uninstall: uninstall-am rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils endif -libdw_a_LIBADD = $(addprefix ../libdwfl/,$(shell $(AR) t ../libdwfl/libdwfl.a)) +libdwfl_objects = $(shell $(AR) t ../libdwfl/libdwfl.a) +libdw_a_LIBADD = $(addprefix ../libdwfl/,$(libdwfl_objects)) noinst_HEADERS = libdwP.h memory-access.h dwarf_abbrev_hash.h \ dwarf_sig8_hash.h cfi.h encoded-value.h |