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 7a768fca6a2a98ab4bbfdd0319661a37a68c96c2..d4c1049d9dfd224c0966c55e8bbd796ffe3b72e0 100644 (file)
--- 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 bf9456087e62b477f0e1d1aed87333b13fd72600..a22166a99e7355e96aeb50991cacfe97630e413a 100644 (file)
--- 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