From: Michael Forney <mforney@mforney.org>
Date: Fri, 1 Nov 2013 07:51:05 +0000 (-0700)
Subject: Fix expansion of libdw_a_LIBADD
X-Git-Tag: elfutils-0.158~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc094394319969ba407e11efa06fefb31f5026b;p=thirdparty%2Felfutils.git

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>
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 7a768fca6..d4c1049d9 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index bf9456087..a22166a99 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