Fix readelf's and objdump's dislplay of DWO links when multiple links are present.

[binutils-gdb.git] / binutils / Makefile.am

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index fb54653fd3a8f615c3e422c29f25c2ebc6a0c146..e2f9e5cb5789016f754d782c1e4430dcf0314967 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -116,6 +116,7 @@ INCDIR      = $(BASEDIR)/include
 AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
         @HDEFINES@ \
         @INCINTL@ \
+        @LARGEFILE_CPPFLAGS@ \
         -DLOCALEDIR="\"$(datadir)/locale\"" \
         -Dbin_dummy_emulation=$(EMULATION_VECTOR)
 
@@ -212,7 +213,7 @@ check-DEJAGNU: site.exp
        fi
 
 development.exp: $(BFDDIR)/development.sh
-       $(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+       $(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
          | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 installcheck-local:
@@ -252,7 +253,7 @@ objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)
 strings_SOURCES = strings.c $(BULIBS)
 
 readelf_SOURCES = readelf.c version.c unwind-ia64.c dwarf.c $(ELFLIBS)
-readelf_LDADD   = $(LIBINTL) $(LIBCTF_NOBFD) $(LIBIBERTY) $(ZLIB) $(DEBUGINFOD_LIBS)
+readelf_LDADD   = $(LIBCTF_NOBFD) $(LIBINTL) $(LIBIBERTY) $(ZLIB) $(DEBUGINFOD_LIBS)
 
 elfedit_SOURCES = elfedit.c version.c $(ELFLIBS)
 elfedit_LDADD = $(LIBINTL) $(LIBIBERTY)