From a1ef399e234ed22e6594a0622362a4c1a26b8967 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 4 Jun 2009 06:51:11 +0000
Subject: 	* dep-in.sed: Don't use \n in replacement part of s command. 
 * Makefile.am (DEP1): LC_ALL for uniq. 	Run "make dep-am". 	*
 Makefile.in: Regenerate.

---
 bfd/ChangeLog   |   7 +
 bfd/Makefile.am | 721 ++++++++++++++++++++++++++++----------------------------
 bfd/Makefile.in | 721 ++++++++++++++++++++++++++++----------------------------
 bfd/dep-in.sed  |   3 +-
 4 files changed, 731 insertions(+), 721 deletions(-)

(limited to 'bfd')

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ea2f0a0..6f8f3ea 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Don't use \n in replacement part of s command.
+	* Makefile.am (DEP1): LC_ALL for uniq.
+	Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-06-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-i386.c (elf_i386_allocate_dynrelocs): Remove check of
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index d9f76e8..50c6720 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -930,7 +930,8 @@ DEP1: $(CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -1252,14 +1253,14 @@ cpu-cr16.lo: \
   cpu-cr16.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-cris.lo: \
-  cpu-cris.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-cr16c.lo: \
   cpu-cr16c.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-cris.lo: \
+  cpu-cris.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-crx.lo: \
   cpu-crx.c \
   $(INCDIR)/filenames.h \
@@ -1296,13 +1297,6 @@ cpu-hppa.lo: \
   cpu-hppa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-ia64.lo: \
-  cpu-ia64.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/ia64.h \
-  $(srcdir)/../opcodes/ia64-opc.h \
-  cpu-ia64-opc.c
 cpu-i370.lo: \
   cpu-i370.c \
   $(INCDIR)/filenames.h \
@@ -1319,6 +1313,13 @@ cpu-i960.lo: \
   cpu-i960.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-ia64.lo: \
+  cpu-ia64.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/ia64.h \
+  $(srcdir)/../opcodes/ia64-opc.h \
+  cpu-ia64-opc.c
 cpu-ip2k.lo: \
   cpu-ip2k.c \
   $(INCDIR)/filenames.h \
@@ -1331,6 +1332,14 @@ cpu-lm32.lo: \
   cpu-lm32.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-m10200.lo: \
+  cpu-m10200.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
+cpu-m10300.lo: \
+  cpu-m10300.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-m32c.lo: \
   cpu-m32c.c \
   $(INCDIR)/filenames.h \
@@ -1356,14 +1365,6 @@ cpu-m88k.lo: \
   cpu-m88k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-m10200.lo: \
-  cpu-m10200.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
-cpu-m10300.lo: \
-  cpu-m10300.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-maxq.lo: \
   cpu-maxq.c \
   $(INCDIR)/filenames.h \
@@ -1396,10 +1397,6 @@ cpu-mt.lo: \
   cpu-mt.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-or32.lo: \
-  cpu-or32.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-ns32k.lo: \
   cpu-ns32k.c \
   $(INCDIR)/filenames.h \
@@ -1409,6 +1406,10 @@ cpu-openrisc.lo: \
   cpu-openrisc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-or32.lo: \
+  cpu-or32.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-pdp11.lo: \
   cpu-pdp11.c \
   $(INCDIR)/filenames.h \
@@ -1475,12 +1476,16 @@ cpu-vax.lo: \
   cpu-vax.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-w65.lo: \
+  cpu-w65.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-we32k.lo: \
   cpu-we32k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-w65.lo: \
-  cpu-w65.c \
+cpu-xc16x.lo: \
+  cpu-xc16x.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
 cpu-xstormy16.lo: \
@@ -1491,10 +1496,6 @@ cpu-xtensa.lo: \
   cpu-xtensa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-xc16x.lo: \
-  cpu-xc16x.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-z80.lo: \
   cpu-z80.c \
   $(INCDIR)/filenames.h \
@@ -1684,6 +1685,18 @@ coff-aux.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
+coff-go32.lo: \
+  coff-go32.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  coff-i386.c \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff-h8300.lo: \
   coff-h8300.c \
   $(INCDIR)/bfdlink.h \
@@ -1730,18 +1743,6 @@ coff-i860.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-go32.lo: \
-  coff-go32.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  coff-i386.c \
-  coffcode.h \
-  coffswap.h \
-  libcoff.h
 coff-i960.lo: \
   coff-i960.c \
   $(INCDIR)/bfdlink.h \
@@ -1928,23 +1929,23 @@ coff-u68k.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-we32k.lo: \
-  coff-we32k.c \
+coff-w65.lo: \
+  coff-w65.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/we32k.h \
+  $(INCDIR)/coff/w65.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-w65.lo: \
-  coff-w65.c \
+coff-we32k.lo: \
+  coff-we32k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/w65.h \
+  $(INCDIR)/coff/we32k.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
@@ -2023,6 +2024,70 @@ ecofflink.lo: \
   $(INCDIR)/objalloc.h \
   libcoff.h \
   libecoff.h
+elf-attrs.lo: \
+  elf-attrs.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-eh-frame.lo: \
+  elf-eh-frame.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h
+elf-m10200.lo: \
+  elf-m10200.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-m10300.lo: \
+  elf-m10300.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mn10300.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-strtab.lo: \
+  elf-strtab.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-vxworks.lo: \
+  elf-vxworks.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/vxworks.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf-vxworks.h
 elf.lo: \
   elf.c \
   $(INCDIR)/bfdlink.h \
@@ -2359,19 +2424,6 @@ elf32-m32r.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-m68k.lo: \
-  elf32-m68k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/m68k.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/m68k.h \
-  elf-bfd.h \
-  elf32-target.h
 elf32-m68hc11.lo: \
   elf32-m68hc11.c \
   $(INCDIR)/bfdlink.h \
@@ -2414,37 +2466,27 @@ elf32-m68hc1x.lo: \
   $(INCDIR)/opcode/m68hc11.h \
   elf-bfd.h \
   elf32-m68hc1x.h
-elf32-m88k.lo: \
-  elf32-m88k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf32-target.h
-elf-m10200.lo: \
-  elf-m10200.c \
+elf32-m68k.lo: \
+  elf32-m68k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/m68k.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/m68k.h \
   elf-bfd.h \
   elf32-target.h
-elf-m10300.lo: \
-  elf-m10300.c \
+elf32-m88k.lo: \
+  elf32-m88k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mn10300.h \
-  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
 elf32-mcore.lo: \
@@ -2472,25 +2514,6 @@ elf32-mep.lo: \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elfxx-mips.lo: \
-  elfxx-mips.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  elf-bfd.h \
-  elf-vxworks.h \
-  elfxx-mips.h
 elf32-mips.lo: \
   elf32-mips.c \
   $(INCDIR)/bfdlink.h \
@@ -2602,27 +2625,20 @@ elf32-ppc.lo: \
   elf-vxworks.h \
   elf32-ppc.h \
   elf32-target.h
-elf32-sh64.lo: \
-  elf32-sh64.c \
+elf32-s390.lo: \
+  elf32-s390.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/s390.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-sh64.h \
   elf32-target.h
-elf32-sh64-com.lo: \
-  elf32-sh64-com.c \
+elf32-sh-symbian.lo: \
+  elf32-sh-symbian.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -2631,20 +2647,12 @@ elf32-sh64-com.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
-  elf-bfd.h \
-  elf32-sh64.h
-elf32-s390.lo: \
-  elf32-s390.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/s390.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(srcdir)/../opcodes/sh-opc.h \
   elf-bfd.h \
+  elf-vxworks.h \
+  elf32-sh-relocs.h \
+  elf32-sh.c \
   elf32-target.h
 elf32-sh.lo: \
   elf32-sh.c \
@@ -2662,8 +2670,8 @@ elf32-sh.lo: \
   elf-vxworks.h \
   elf32-sh-relocs.h \
   elf32-target.h
-elf32-sh-symbian.lo: \
-  elf32-sh-symbian.c \
+elf32-sh64-com.lo: \
+  elf32-sh64-com.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -2672,28 +2680,28 @@ elf32-sh-symbian.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-target.h
-elfxx-sparc.lo: \
-  elfxx-sparc.c \
+  elf32-sh64.h
+elf32-sh64.lo: \
+  elf32-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
   elf-vxworks.h \
-  elfxx-sparc.h
+  elf32-sh-relocs.h \
+  elf32-sh.c \
+  elf32-sh64.h \
+  elf32-target.h
 elf32-sparc.lo: \
   elf32-sparc.c \
   $(INCDIR)/bfdlink.h \
@@ -2748,45 +2756,45 @@ elf32-vax.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xstormy16.lo: \
-  elf32-xstormy16.c \
+elf32-xc16x.lo: \
+  elf32-xc16x.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xstormy16.h \
+  $(INCDIR)/elf/xc16x.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xtensa.lo: \
-  elf32-xtensa.c \
+elf32-xstormy16.lo: \
+  elf32-xstormy16.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xtensa.h \
+  $(INCDIR)/elf/xstormy16.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/xtensa-config.h \
-  $(INCDIR)/xtensa-isa.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xc16x.lo: \
-  elf32-xc16x.c \
+elf32-xtensa.lo: \
+  elf32-xtensa.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xc16x.h \
+  $(INCDIR)/elf/xtensa.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/xtensa-config.h \
+  $(INCDIR)/xtensa-isa.h \
   elf-bfd.h \
   elf32-target.h
 elf32.lo: \
@@ -2813,47 +2821,40 @@ elflink.lo: \
   $(INCDIR)/objalloc.h \
   $(INCDIR)/safe-ctype.h \
   elf-bfd.h
-elf-attrs.lo: \
-  elf-attrs.c \
+elfxx-mips.lo: \
+  elfxx-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-strtab.lo: \
-  elf-strtab.c \
+  elf-bfd.h \
+  elf-vxworks.h \
+  elfxx-mips.h
+elfxx-sparc.lo: \
+  elfxx-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-eh-frame.lo: \
-  elf-eh-frame.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h
-elf-vxworks.lo: \
-  elf-vxworks.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/vxworks.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf-vxworks.h
+  elf-vxworks.h \
+  elfxx-sparc.h
 epoc-pe-arm.lo: \
   epoc-pe-arm.c \
   $(INCDIR)/bfdlink.h \
@@ -2909,10 +2910,6 @@ hp300hpux.lo: \
   aout-target.h \
   aoutx.h \
   libaout.h
-som.lo: \
-  som.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/filenames.h
 i386aout.lo: \
   i386aout.c \
   $(INCDIR)/aout/aout64.h \
@@ -2983,6 +2980,17 @@ i386lynx.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+i386mach3.lo: \
+  i386mach3.c \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  aout-target.h \
+  libaout.h
 i386msdos.lo: \
   i386msdos.c \
   $(INCDIR)/bfdlink.h \
@@ -3001,17 +3009,6 @@ i386netbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-i386mach3.lo: \
-  i386mach3.c \
-  $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  aout-target.h \
-  libaout.h
 i386os9k.lo: \
   i386os9k.c \
   $(INCDIR)/bfdlink.h \
@@ -3134,25 +3131,25 @@ nlm32-i386.lo: \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-sparc.lo: \
-  nlm32-sparc.c \
+nlm32-ppc.lo: \
+  nlm32-ppc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/sparc32-ext.h \
+  $(INCDIR)/nlm/ppc-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-ppc.lo: \
-  nlm32-ppc.c \
+nlm32-sparc.lo: \
+  nlm32-sparc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/ppc-ext.h \
+  $(INCDIR)/nlm/sparc32-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
@@ -3207,16 +3204,8 @@ pdp11.lo: \
   $(INCDIR)/safe-ctype.h \
   aout-target.h \
   libaout.h
-pef.lo: \
-  pef.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(INCDIR)/safe-ctype.h \
-  pef-traceback.h \
-  pef.h
-pe-arm.lo: \
-  pe-arm.c \
+pe-arm-wince.lo: \
+  pe-arm-wince.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3228,9 +3217,10 @@ pe-arm.lo: \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pe-arm.c \
   peicode.h
-pei-arm.lo: \
-  pei-arm.c \
+pe-arm.lo: \
+  pe-arm.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3243,184 +3233,191 @@ pei-arm.lo: \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-arm-wince.lo: \
-  pe-arm-wince.c \
+pe-i386.lo: \
+  pe-i386.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-arm.c \
   peicode.h
-pei-arm-wince.lo: \
-  pei-arm-wince.c \
+pe-mcore.lo: \
+  pe-mcore.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pei-arm.c \
   peicode.h
-pe-i386.lo: \
-  pe-i386.c \
+pe-mips.lo: \
+  pe-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-i386.lo: \
-  pei-i386.c \
+pe-ppc.lo: \
+  pe-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-mcore.lo: \
-  pe-mcore.c \
+pe-sh.lo: \
+  pe-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mcore.lo: \
-  pei-mcore.c \
+pef.lo: \
+  pef.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  pef-traceback.h \
+  pef.h
+pei-arm-wince.lo: \
+  pei-arm-wince.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pei-arm.c \
   peicode.h
-pe-ppc.lo: \
-  pe-ppc.c \
+pei-arm.lo: \
+  pei-arm.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-ppc.lo: \
-  pei-ppc.c \
+pei-i386.lo: \
+  pei-i386.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-sh.lo: \
-  pe-sh.c \
+pei-mcore.lo: \
+  pei-mcore.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-sh.lo: \
-  pei-sh.c \
+pei-mips.lo: \
+  pei-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  peicode.h
-pe-mips.lo: \
   pe-mips.c \
+  peicode.h
+pei-ppc.lo: \
+  pei-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mips.lo: \
-  pei-mips.c \
+pei-sh.lo: \
+  pei-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-mips.c \
   peicode.h
 plugin.lo: \
   plugin.c \
-  $(INCDIR)/plugin-api.h \
   $(INCDIR)/filenames.h \
-  plugin.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/plugin-api.h \
+  plugin.h
 ppcboot.lo: \
   ppcboot.c \
   $(INCDIR)/filenames.h \
@@ -3445,6 +3442,10 @@ riscix.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+som.lo: \
+  som.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/filenames.h
 sparclinux.lo: \
   sparclinux.c \
   $(INCDIR)/aout/aout64.h \
@@ -3493,8 +3494,8 @@ sunos.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-vaxnetbsd.lo: \
-  vaxnetbsd.c \
+vax1knetbsd.lo: \
+  vax1knetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3505,8 +3506,8 @@ vaxnetbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-vax1knetbsd.lo: \
-  vax1knetbsd.c \
+vaxbsd.lo: \
+  vaxbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3515,10 +3516,9 @@ vax1knetbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h \
-  netbsd.h
-vaxbsd.lo: \
-  vaxbsd.c \
+  libaout.h
+vaxnetbsd.lo: \
+  vaxnetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3527,18 +3527,13 @@ vaxbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h
+  libaout.h \
+  netbsd.h
 versados.lo: \
   versados.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h
-vms.lo: \
-  vms.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  vms.h
 vms-gsd.lo: \
   vms-gsd.c \
   $(INCDIR)/bfdlink.h \
@@ -3565,6 +3560,12 @@ vms-tir.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   vms.h
+vms.lo: \
+  vms.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  vms.h
 vmsutil.lo: \
   vmsutil.c \
   vmsutil.h
@@ -3624,6 +3625,19 @@ coff-alpha.lo: \
   ecoffswap.h \
   libcoff.h \
   libecoff.h
+coff-x86_64.lo: \
+  coff-x86_64.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff64-rs6000.lo: \
   coff64-rs6000.c \
   $(INCDIR)/bfdlink.h \
@@ -3649,33 +3663,33 @@ demo64.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-pei-ia64.lo: \
-  pei-ia64.c \
+elf32-score.lo: \
+  elf32-score.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/ia64.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ia64.c \
-  coffcode.h \
-  libcoff.h \
-  libpei.h \
-  peicode.h
-elf64-x86-64.lo: \
-  elf64-x86-64.c \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-score.h \
+  elf32-target.h
+elf32-score7.lo: \
+  elf32-score7.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  bfd_stdint.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h
+  elf32-score.h
 elf64-alpha.lo: \
   elf64-alpha.c \
   $(INCDIR)/aout/ar.h \
@@ -3697,22 +3711,6 @@ elf64-alpha.lo: \
   elf64-target.h \
   libcoff.h \
   libecoff.h
-elf64-hppa.lo: \
-  elf64-hppa.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/hppa.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf-hppa.h \
-  elf64-hppa.h \
-  elf64-target.h \
-  libhppa.h
 elf64-gen.lo: \
   elf64-gen.c \
   $(INCDIR)/bfdlink.h \
@@ -3723,27 +3721,22 @@ elf64-gen.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elfn32-mips.lo: \
-  elfn32-mips.c \
+elf64-hppa.lo: \
+  elf64-hppa.c \
+  $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/hppa.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  ecoffswap.h \
   elf-bfd.h \
-  elf32-target.h \
-  elfxx-mips.h \
-  genlink.h
+  elf-hppa.h \
+  elf64-hppa.h \
+  elf64-target.h \
+  libhppa.h
 elf64-mips.lo: \
   elf64-mips.c \
   $(INCDIR)/aout/ar.h \
@@ -3803,71 +3796,78 @@ elf64-s390.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elf32-score.lo: \
-  elf32-score.c \
+elf64-sh64.lo: \
+  elf64-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf32-score.h \
-  elf32-target.h
-elf32-score7.lo: \
-  elf32-score7.c \
+  elf64-target.h
+elf64-sparc.lo: \
+  elf64-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf32-score.h
-elf64-sh64.lo: \
-  elf64-sh64.c \
+  elf64-target.h \
+  elfxx-sparc.h
+elf64-x86-64.lo: \
+  elf64-x86-64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  bfd_stdint.h \
   elf-bfd.h \
   elf64-target.h
-elf64-sparc.lo: \
-  elf64-sparc.c \
+elf64.lo: \
+  elf64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h \
-  elfxx-sparc.h
-elf64.lo: \
-  elf64.c \
+  elfcode.h \
+  elfcore.h
+elfn32-mips.lo: \
+  elfn32-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  ecoffswap.h \
   elf-bfd.h \
-  elfcode.h \
-  elfcore.h
+  elf32-target.h \
+  elfxx-mips.h \
+  genlink.h
 mmo.lo: \
   mmo.c \
   $(INCDIR)/elf/mmix.h \
@@ -3896,8 +3896,8 @@ nlm64.lo: \
   $(INCDIR)/nlm/internal.h \
   libnlm.h \
   nlmcode.h
-coff-x86_64.lo: \
-  coff-x86_64.c \
+pe-x86_64.lo: \
+  pe-x86_64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
@@ -3906,20 +3906,21 @@ coff-x86_64.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
+  coff-x86_64.c \
   coffcode.h \
-  coffswap.h \
-  libcoff.h
-pe-x86_64.lo: \
-  pe-x86_64.c \
+  libcoff.h \
+  libpei.h \
+  peicode.h
+pei-ia64.lo: \
+  pei-ia64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/ia64.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/x86_64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-x86_64.c \
+  coff-ia64.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
@@ -3948,6 +3949,10 @@ aix386-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libcoff.h
+cisco-core.lo: \
+  cisco-core.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 hpux-core.lo: \
   hpux-core.c \
   $(INCDIR)/filenames.h \
@@ -3976,10 +3981,6 @@ trad-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libaout.h
-cisco-core.lo: \
-  cisco-core.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 elf32-ia64.lo: \
   elf32-ia64.c \
   $(INCDIR)/bfdlink.h \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index f9f0afd..605fab8 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1546,7 +1546,8 @@ DEP1: $(CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -1853,14 +1854,14 @@ cpu-cr16.lo: \
   cpu-cr16.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-cris.lo: \
-  cpu-cris.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-cr16c.lo: \
   cpu-cr16c.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-cris.lo: \
+  cpu-cris.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-crx.lo: \
   cpu-crx.c \
   $(INCDIR)/filenames.h \
@@ -1897,13 +1898,6 @@ cpu-hppa.lo: \
   cpu-hppa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-ia64.lo: \
-  cpu-ia64.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/ia64.h \
-  $(srcdir)/../opcodes/ia64-opc.h \
-  cpu-ia64-opc.c
 cpu-i370.lo: \
   cpu-i370.c \
   $(INCDIR)/filenames.h \
@@ -1920,6 +1914,13 @@ cpu-i960.lo: \
   cpu-i960.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-ia64.lo: \
+  cpu-ia64.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/ia64.h \
+  $(srcdir)/../opcodes/ia64-opc.h \
+  cpu-ia64-opc.c
 cpu-ip2k.lo: \
   cpu-ip2k.c \
   $(INCDIR)/filenames.h \
@@ -1932,6 +1933,14 @@ cpu-lm32.lo: \
   cpu-lm32.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-m10200.lo: \
+  cpu-m10200.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
+cpu-m10300.lo: \
+  cpu-m10300.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-m32c.lo: \
   cpu-m32c.c \
   $(INCDIR)/filenames.h \
@@ -1957,14 +1966,6 @@ cpu-m88k.lo: \
   cpu-m88k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-m10200.lo: \
-  cpu-m10200.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
-cpu-m10300.lo: \
-  cpu-m10300.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-maxq.lo: \
   cpu-maxq.c \
   $(INCDIR)/filenames.h \
@@ -1997,10 +1998,6 @@ cpu-mt.lo: \
   cpu-mt.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-or32.lo: \
-  cpu-or32.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-ns32k.lo: \
   cpu-ns32k.c \
   $(INCDIR)/filenames.h \
@@ -2010,6 +2007,10 @@ cpu-openrisc.lo: \
   cpu-openrisc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-or32.lo: \
+  cpu-or32.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-pdp11.lo: \
   cpu-pdp11.c \
   $(INCDIR)/filenames.h \
@@ -2076,12 +2077,16 @@ cpu-vax.lo: \
   cpu-vax.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-w65.lo: \
+  cpu-w65.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-we32k.lo: \
   cpu-we32k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-w65.lo: \
-  cpu-w65.c \
+cpu-xc16x.lo: \
+  cpu-xc16x.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
 cpu-xstormy16.lo: \
@@ -2092,10 +2097,6 @@ cpu-xtensa.lo: \
   cpu-xtensa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-xc16x.lo: \
-  cpu-xc16x.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-z80.lo: \
   cpu-z80.c \
   $(INCDIR)/filenames.h \
@@ -2285,6 +2286,18 @@ coff-aux.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
+coff-go32.lo: \
+  coff-go32.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  coff-i386.c \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff-h8300.lo: \
   coff-h8300.c \
   $(INCDIR)/bfdlink.h \
@@ -2331,18 +2344,6 @@ coff-i860.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-go32.lo: \
-  coff-go32.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  coff-i386.c \
-  coffcode.h \
-  coffswap.h \
-  libcoff.h
 coff-i960.lo: \
   coff-i960.c \
   $(INCDIR)/bfdlink.h \
@@ -2529,23 +2530,23 @@ coff-u68k.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-we32k.lo: \
-  coff-we32k.c \
+coff-w65.lo: \
+  coff-w65.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/we32k.h \
+  $(INCDIR)/coff/w65.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-w65.lo: \
-  coff-w65.c \
+coff-we32k.lo: \
+  coff-we32k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/w65.h \
+  $(INCDIR)/coff/we32k.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
@@ -2624,6 +2625,70 @@ ecofflink.lo: \
   $(INCDIR)/objalloc.h \
   libcoff.h \
   libecoff.h
+elf-attrs.lo: \
+  elf-attrs.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-eh-frame.lo: \
+  elf-eh-frame.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h
+elf-m10200.lo: \
+  elf-m10200.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-m10300.lo: \
+  elf-m10300.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mn10300.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-strtab.lo: \
+  elf-strtab.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-vxworks.lo: \
+  elf-vxworks.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/vxworks.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf-vxworks.h
 elf.lo: \
   elf.c \
   $(INCDIR)/bfdlink.h \
@@ -2960,19 +3025,6 @@ elf32-m32r.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-m68k.lo: \
-  elf32-m68k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/m68k.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/m68k.h \
-  elf-bfd.h \
-  elf32-target.h
 elf32-m68hc11.lo: \
   elf32-m68hc11.c \
   $(INCDIR)/bfdlink.h \
@@ -3015,37 +3067,27 @@ elf32-m68hc1x.lo: \
   $(INCDIR)/opcode/m68hc11.h \
   elf-bfd.h \
   elf32-m68hc1x.h
-elf32-m88k.lo: \
-  elf32-m88k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf32-target.h
-elf-m10200.lo: \
-  elf-m10200.c \
+elf32-m68k.lo: \
+  elf32-m68k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/m68k.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/m68k.h \
   elf-bfd.h \
   elf32-target.h
-elf-m10300.lo: \
-  elf-m10300.c \
+elf32-m88k.lo: \
+  elf32-m88k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mn10300.h \
-  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
 elf32-mcore.lo: \
@@ -3073,25 +3115,6 @@ elf32-mep.lo: \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elfxx-mips.lo: \
-  elfxx-mips.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  elf-bfd.h \
-  elf-vxworks.h \
-  elfxx-mips.h
 elf32-mips.lo: \
   elf32-mips.c \
   $(INCDIR)/bfdlink.h \
@@ -3203,27 +3226,20 @@ elf32-ppc.lo: \
   elf-vxworks.h \
   elf32-ppc.h \
   elf32-target.h
-elf32-sh64.lo: \
-  elf32-sh64.c \
+elf32-s390.lo: \
+  elf32-s390.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/s390.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-sh64.h \
   elf32-target.h
-elf32-sh64-com.lo: \
-  elf32-sh64-com.c \
+elf32-sh-symbian.lo: \
+  elf32-sh-symbian.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -3232,20 +3248,12 @@ elf32-sh64-com.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
-  elf-bfd.h \
-  elf32-sh64.h
-elf32-s390.lo: \
-  elf32-s390.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/s390.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(srcdir)/../opcodes/sh-opc.h \
   elf-bfd.h \
+  elf-vxworks.h \
+  elf32-sh-relocs.h \
+  elf32-sh.c \
   elf32-target.h
 elf32-sh.lo: \
   elf32-sh.c \
@@ -3263,8 +3271,8 @@ elf32-sh.lo: \
   elf-vxworks.h \
   elf32-sh-relocs.h \
   elf32-target.h
-elf32-sh-symbian.lo: \
-  elf32-sh-symbian.c \
+elf32-sh64-com.lo: \
+  elf32-sh64-com.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -3273,28 +3281,28 @@ elf32-sh-symbian.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-target.h
-elfxx-sparc.lo: \
-  elfxx-sparc.c \
+  elf32-sh64.h
+elf32-sh64.lo: \
+  elf32-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
   elf-vxworks.h \
-  elfxx-sparc.h
+  elf32-sh-relocs.h \
+  elf32-sh.c \
+  elf32-sh64.h \
+  elf32-target.h
 elf32-sparc.lo: \
   elf32-sparc.c \
   $(INCDIR)/bfdlink.h \
@@ -3349,45 +3357,45 @@ elf32-vax.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xstormy16.lo: \
-  elf32-xstormy16.c \
+elf32-xc16x.lo: \
+  elf32-xc16x.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xstormy16.h \
+  $(INCDIR)/elf/xc16x.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xtensa.lo: \
-  elf32-xtensa.c \
+elf32-xstormy16.lo: \
+  elf32-xstormy16.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xtensa.h \
+  $(INCDIR)/elf/xstormy16.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/xtensa-config.h \
-  $(INCDIR)/xtensa-isa.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xc16x.lo: \
-  elf32-xc16x.c \
+elf32-xtensa.lo: \
+  elf32-xtensa.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xc16x.h \
+  $(INCDIR)/elf/xtensa.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/xtensa-config.h \
+  $(INCDIR)/xtensa-isa.h \
   elf-bfd.h \
   elf32-target.h
 elf32.lo: \
@@ -3414,47 +3422,40 @@ elflink.lo: \
   $(INCDIR)/objalloc.h \
   $(INCDIR)/safe-ctype.h \
   elf-bfd.h
-elf-attrs.lo: \
-  elf-attrs.c \
+elfxx-mips.lo: \
+  elfxx-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-strtab.lo: \
-  elf-strtab.c \
+  elf-bfd.h \
+  elf-vxworks.h \
+  elfxx-mips.h
+elfxx-sparc.lo: \
+  elfxx-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-eh-frame.lo: \
-  elf-eh-frame.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h
-elf-vxworks.lo: \
-  elf-vxworks.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/vxworks.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf-vxworks.h
+  elf-vxworks.h \
+  elfxx-sparc.h
 epoc-pe-arm.lo: \
   epoc-pe-arm.c \
   $(INCDIR)/bfdlink.h \
@@ -3510,10 +3511,6 @@ hp300hpux.lo: \
   aout-target.h \
   aoutx.h \
   libaout.h
-som.lo: \
-  som.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/filenames.h
 i386aout.lo: \
   i386aout.c \
   $(INCDIR)/aout/aout64.h \
@@ -3584,6 +3581,17 @@ i386lynx.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+i386mach3.lo: \
+  i386mach3.c \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  aout-target.h \
+  libaout.h
 i386msdos.lo: \
   i386msdos.c \
   $(INCDIR)/bfdlink.h \
@@ -3602,17 +3610,6 @@ i386netbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-i386mach3.lo: \
-  i386mach3.c \
-  $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  aout-target.h \
-  libaout.h
 i386os9k.lo: \
   i386os9k.c \
   $(INCDIR)/bfdlink.h \
@@ -3735,25 +3732,25 @@ nlm32-i386.lo: \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-sparc.lo: \
-  nlm32-sparc.c \
+nlm32-ppc.lo: \
+  nlm32-ppc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/sparc32-ext.h \
+  $(INCDIR)/nlm/ppc-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-ppc.lo: \
-  nlm32-ppc.c \
+nlm32-sparc.lo: \
+  nlm32-sparc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/ppc-ext.h \
+  $(INCDIR)/nlm/sparc32-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
@@ -3808,16 +3805,8 @@ pdp11.lo: \
   $(INCDIR)/safe-ctype.h \
   aout-target.h \
   libaout.h
-pef.lo: \
-  pef.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(INCDIR)/safe-ctype.h \
-  pef-traceback.h \
-  pef.h
-pe-arm.lo: \
-  pe-arm.c \
+pe-arm-wince.lo: \
+  pe-arm-wince.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3829,9 +3818,10 @@ pe-arm.lo: \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pe-arm.c \
   peicode.h
-pei-arm.lo: \
-  pei-arm.c \
+pe-arm.lo: \
+  pe-arm.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3844,184 +3834,191 @@ pei-arm.lo: \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-arm-wince.lo: \
-  pe-arm-wince.c \
+pe-i386.lo: \
+  pe-i386.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-arm.c \
   peicode.h
-pei-arm-wince.lo: \
-  pei-arm-wince.c \
+pe-mcore.lo: \
+  pe-mcore.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pei-arm.c \
   peicode.h
-pe-i386.lo: \
-  pe-i386.c \
+pe-mips.lo: \
+  pe-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-i386.lo: \
-  pei-i386.c \
+pe-ppc.lo: \
+  pe-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-mcore.lo: \
-  pe-mcore.c \
+pe-sh.lo: \
+  pe-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mcore.lo: \
-  pei-mcore.c \
+pef.lo: \
+  pef.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  pef-traceback.h \
+  pef.h
+pei-arm-wince.lo: \
+  pei-arm-wince.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pei-arm.c \
   peicode.h
-pe-ppc.lo: \
-  pe-ppc.c \
+pei-arm.lo: \
+  pei-arm.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-ppc.lo: \
-  pei-ppc.c \
+pei-i386.lo: \
+  pei-i386.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-sh.lo: \
-  pe-sh.c \
+pei-mcore.lo: \
+  pei-mcore.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-sh.lo: \
-  pei-sh.c \
+pei-mips.lo: \
+  pei-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  peicode.h
-pe-mips.lo: \
   pe-mips.c \
+  peicode.h
+pei-ppc.lo: \
+  pei-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mips.lo: \
-  pei-mips.c \
+pei-sh.lo: \
+  pei-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-mips.c \
   peicode.h
 plugin.lo: \
   plugin.c \
-  $(INCDIR)/plugin-api.h \
   $(INCDIR)/filenames.h \
-  plugin.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/plugin-api.h \
+  plugin.h
 ppcboot.lo: \
   ppcboot.c \
   $(INCDIR)/filenames.h \
@@ -4046,6 +4043,10 @@ riscix.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+som.lo: \
+  som.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/filenames.h
 sparclinux.lo: \
   sparclinux.c \
   $(INCDIR)/aout/aout64.h \
@@ -4094,8 +4095,8 @@ sunos.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-vaxnetbsd.lo: \
-  vaxnetbsd.c \
+vax1knetbsd.lo: \
+  vax1knetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -4106,8 +4107,8 @@ vaxnetbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-vax1knetbsd.lo: \
-  vax1knetbsd.c \
+vaxbsd.lo: \
+  vaxbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -4116,10 +4117,9 @@ vax1knetbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h \
-  netbsd.h
-vaxbsd.lo: \
-  vaxbsd.c \
+  libaout.h
+vaxnetbsd.lo: \
+  vaxnetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -4128,18 +4128,13 @@ vaxbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h
+  libaout.h \
+  netbsd.h
 versados.lo: \
   versados.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h
-vms.lo: \
-  vms.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  vms.h
 vms-gsd.lo: \
   vms-gsd.c \
   $(INCDIR)/bfdlink.h \
@@ -4166,6 +4161,12 @@ vms-tir.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   vms.h
+vms.lo: \
+  vms.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  vms.h
 vmsutil.lo: \
   vmsutil.c \
   vmsutil.h
@@ -4225,6 +4226,19 @@ coff-alpha.lo: \
   ecoffswap.h \
   libcoff.h \
   libecoff.h
+coff-x86_64.lo: \
+  coff-x86_64.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff64-rs6000.lo: \
   coff64-rs6000.c \
   $(INCDIR)/bfdlink.h \
@@ -4250,33 +4264,33 @@ demo64.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-pei-ia64.lo: \
-  pei-ia64.c \
+elf32-score.lo: \
+  elf32-score.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/ia64.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ia64.c \
-  coffcode.h \
-  libcoff.h \
-  libpei.h \
-  peicode.h
-elf64-x86-64.lo: \
-  elf64-x86-64.c \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-score.h \
+  elf32-target.h
+elf32-score7.lo: \
+  elf32-score7.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  bfd_stdint.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h
+  elf32-score.h
 elf64-alpha.lo: \
   elf64-alpha.c \
   $(INCDIR)/aout/ar.h \
@@ -4298,22 +4312,6 @@ elf64-alpha.lo: \
   elf64-target.h \
   libcoff.h \
   libecoff.h
-elf64-hppa.lo: \
-  elf64-hppa.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/hppa.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf-hppa.h \
-  elf64-hppa.h \
-  elf64-target.h \
-  libhppa.h
 elf64-gen.lo: \
   elf64-gen.c \
   $(INCDIR)/bfdlink.h \
@@ -4324,27 +4322,22 @@ elf64-gen.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elfn32-mips.lo: \
-  elfn32-mips.c \
+elf64-hppa.lo: \
+  elf64-hppa.c \
+  $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/hppa.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  ecoffswap.h \
   elf-bfd.h \
-  elf32-target.h \
-  elfxx-mips.h \
-  genlink.h
+  elf-hppa.h \
+  elf64-hppa.h \
+  elf64-target.h \
+  libhppa.h
 elf64-mips.lo: \
   elf64-mips.c \
   $(INCDIR)/aout/ar.h \
@@ -4404,71 +4397,78 @@ elf64-s390.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elf32-score.lo: \
-  elf32-score.c \
+elf64-sh64.lo: \
+  elf64-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf32-score.h \
-  elf32-target.h
-elf32-score7.lo: \
-  elf32-score7.c \
+  elf64-target.h
+elf64-sparc.lo: \
+  elf64-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf32-score.h
-elf64-sh64.lo: \
-  elf64-sh64.c \
+  elf64-target.h \
+  elfxx-sparc.h
+elf64-x86-64.lo: \
+  elf64-x86-64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  bfd_stdint.h \
   elf-bfd.h \
   elf64-target.h
-elf64-sparc.lo: \
-  elf64-sparc.c \
+elf64.lo: \
+  elf64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h \
-  elfxx-sparc.h
-elf64.lo: \
-  elf64.c \
+  elfcode.h \
+  elfcore.h
+elfn32-mips.lo: \
+  elfn32-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  ecoffswap.h \
   elf-bfd.h \
-  elfcode.h \
-  elfcore.h
+  elf32-target.h \
+  elfxx-mips.h \
+  genlink.h
 mmo.lo: \
   mmo.c \
   $(INCDIR)/elf/mmix.h \
@@ -4497,8 +4497,8 @@ nlm64.lo: \
   $(INCDIR)/nlm/internal.h \
   libnlm.h \
   nlmcode.h
-coff-x86_64.lo: \
-  coff-x86_64.c \
+pe-x86_64.lo: \
+  pe-x86_64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
@@ -4507,20 +4507,21 @@ coff-x86_64.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
+  coff-x86_64.c \
   coffcode.h \
-  coffswap.h \
-  libcoff.h
-pe-x86_64.lo: \
-  pe-x86_64.c \
+  libcoff.h \
+  libpei.h \
+  peicode.h
+pei-ia64.lo: \
+  pei-ia64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/ia64.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/x86_64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-x86_64.c \
+  coff-ia64.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
@@ -4549,6 +4550,10 @@ aix386-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libcoff.h
+cisco-core.lo: \
+  cisco-core.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 hpux-core.lo: \
   hpux-core.c \
   $(INCDIR)/filenames.h \
@@ -4577,10 +4582,6 @@ trad-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libaout.h
-cisco-core.lo: \
-  cisco-core.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 elf32-ia64.lo: \
   elf32-ia64.c \
   $(INCDIR)/bfdlink.h \
diff --git a/bfd/dep-in.sed b/bfd/dep-in.sed
index c9ce802..2e0a4fb 100644
--- a/bfd/dep-in.sed
+++ b/bfd/dep-in.sed
@@ -23,5 +23,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
-- 
cgit v1.1