* dep-in.sed: Output one filename per line with all lines having

	continuation backslash.  Prefix first line with "A", following
	lines with "B".
	* Makefile.am (DEP): Don't use dep.sed here.
	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
	sort and uniq.
	* Makefile.in: Regenerate.

12 files changed, 3286 insertions, 957 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7c4e334..ff0e640 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Output one filename per line with all lines having
+	continuation backslash.  Prefix first line with "A", following
+	lines with "B".
+	* Makefile.am (DEP): Don't use dep.sed here.
+	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
+	sort and uniq.
+	* Makefile.in: Regenerate.
+
 2009-05-25  Tristan Gingold  <gingold@adacore.com>
 
 	* makefile.vms-in: Fix CFLAGS, add addr2line.exe target.
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 01768ca..535e556 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -398,18 +398,23 @@ DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -474,271 +479,868 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-addr2line.o: addr2line.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h bucomm.h
-ar.o: ar.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/aout/ar.h \
-  $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h bucomm.h arsup.h \
-  $(INCDIR)/filenames.h binemul.h
-arsup.o: arsup.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/filenames.h bucomm.h \
-  arsup.h
-bin2c.o: bin2c.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-binemul.o: binemul.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-bucomm.o: bucomm.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h \
-  $(INCDIR)/hashtab.h bucomm.h
-coffdump.o: coffdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h coffgrok.h
-coffgrok.o: coffgrok.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  $(INCDIR)/bfdlink.h bucomm.h coffgrok.h
-cxxfilt.o: cxxfilt.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/safe-ctype.h \
-  bucomm.h
-dwarf.o: dwarf.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h $(INCDIR)/libiberty.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h dwarf.h
-debug.o: debug.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h debug.h
-dlltool.o: dlltool.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/dyn-string.h \
-  bucomm.h dlltool.h $(INCDIR)/safe-ctype.h
-dllwrap.o: dllwrap.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/dyn-string.h bucomm.h
-emul_aix.o: emul_aix.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
-emul_vanilla.o: emul_vanilla.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-filemode.o: filemode.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-ieee.o: ieee.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/ieee.h $(INCDIR)/libiberty.h debug.h budbg.h \
-  $(INCDIR)/filenames.h
-is-ranlib.o: is-ranlib.c
-is-strip.o: is-strip.c
-maybe-ranlib.o: maybe-ranlib.c
-maybe-strip.o: maybe-strip.c
-nlmconv.o: nlmconv.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(BFDDIR)/libnlm.h \
-  $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
-  nlmconv.h bucomm.h
-nm.o: nm.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
-  $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h bucomm.h
-not-ranlib.o: not-ranlib.c
-not-strip.o: not-strip.c
-objcopy.o: objcopy.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h $(INCDIR)/libiberty.h bucomm.h \
-  budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
-  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/external.h $(INCDIR)/coff/pe.h
-objdump.o: objdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/progress.h \
-  bucomm.h dwarf.h $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/filenames.h \
-  debug.h budbg.h $(INCDIR)/aout/aout64.h
-prdbg.o: prdbg.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h debug.h \
-  budbg.h
-rclex.o: rclex.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windres.h winduni.h windint.h rcparse.h
-rdcoff.o: rdcoff.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/libiberty.h bucomm.h \
-  debug.h budbg.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
-rddbg.o: rddbg.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h debug.h budbg.h
-readelf.o: readelf.c config.h sysdep.h $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h dwarf.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/alpha.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h \
-  $(INCDIR)/elf/avr.h $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cr16.h \
-  $(INCDIR)/elf/cris.h $(INCDIR)/elf/crx.h $(INCDIR)/elf/d10v.h \
-  $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h $(INCDIR)/elf/fr30.h \
-  $(INCDIR)/elf/frv.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h \
-  $(INCDIR)/elf/i370.h $(INCDIR)/elf/i860.h $(INCDIR)/elf/i960.h \
-  $(INCDIR)/elf/ia64.h $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/lm32.h \
-  $(INCDIR)/elf/iq2000.h $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h \
-  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
-  $(INCDIR)/elf/mep.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/mmix.h \
-  $(INCDIR)/elf/mn10200.h $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/mt.h \
-  $(INCDIR)/elf/msp430.h $(INCDIR)/elf/or32.h $(INCDIR)/elf/pj.h \
-  $(INCDIR)/elf/ppc.h $(INCDIR)/elf/ppc64.h $(INCDIR)/elf/s390.h \
-  $(INCDIR)/elf/score.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/sparc.h \
-  $(INCDIR)/elf/spu.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
-  $(INCDIR)/elf/x86-64.h $(INCDIR)/elf/xstormy16.h $(INCDIR)/elf/xtensa.h \
-  $(INCDIR)/aout/ar.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/filenames.h unwind-ia64.h
-rename.o: rename.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-resbin.o: resbin.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h
-rescoff.o: rescoff.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  $(INCDIR)/bfdlink.h
-resrc.o: resrc.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windres.h winduni.h windint.h
-resres.o: resres.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h
-size.o: size.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h
-srconv.o: srconv.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h sysroff.h coffgrok.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-  sysroff.c
-stabs.o: stabs.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/demangle.h \
-  debug.h budbg.h $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
-strings.o: strings.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h bucomm.h
-sysdump.o: sysdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h bucomm.h \
-  sysroff.h sysroff.c
-unwind-ia64.o: unwind-ia64.c unwind-ia64.h $(INCDIR)/elf/ia64.h \
-  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h
-version.o: version.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-windres.o: windres.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/obstack.h windres.h winduni.h windint.h
-winduni.o: winduni.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h winduni.h $(INCDIR)/safe-ctype.h
-wrstabs.o: wrstabs.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h bucomm.h \
-  debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def
-windmc.o: windmc.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/obstack.h windmc.h winduni.h windint.h
-mclex.o: mclex.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windmc.h winduni.h mcparse.h
-arparse.o: arparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  arsup.h
-arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+addr2line.o: \
+  addr2line.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+ar.o: \
+  ar.c \
+  $(BFDDIR)/libbfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+arsup.o: \
+  arsup.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+bin2c.o: \
+  bin2c.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+binemul.o: \
+  binemul.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+bucomm.o: \
+  bucomm.c \
+  $(BFDDIR)/libbfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+coffdump.o: \
+  coffdump.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h
+coffgrok.o: \
+  coffgrok.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h
+cxxfilt.o: \
+  cxxfilt.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+dwarf.o: \
+  dwarf.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dwarf.h \
+  sysdep.h
+debug.o: \
+  debug.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  debug.h \
+  sysdep.h
+dlltool.o: \
+  dlltool.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/dyn-string.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dlltool.h \
+  sysdep.h
+dllwrap.o: \
+  dllwrap.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/dyn-string.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+emul_aix.o: \
+  emul_aix.c \
+  $(BFDDIR)/libcoff.h \
+  $(BFDDIR)/libxcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/xcoff.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+emul_vanilla.o: \
+  emul_vanilla.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+filemode.o: \
+  filemode.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+ieee.o: \
+  ieee.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/ieee.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+is-ranlib.o: \
+  is-ranlib.c
+is-strip.o: \
+  is-strip.c
+maybe-ranlib.o: \
+  maybe-ranlib.c
+maybe-strip.o: \
+  maybe-strip.c
+nlmconv.o: \
+  nlmconv.c \
+  $(BFDDIR)/libnlm.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/nlm/common.h \
+  $(INCDIR)/nlm/external.h \
+  $(INCDIR)/nlm/internal.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  nlmconv.h \
+  sysdep.h
+nm.o: \
+  nm.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ranlib.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+not-ranlib.o: \
+  not-ranlib.c
+not-strip.o: \
+  not-strip.c
+objcopy.o: \
+  objcopy.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(BFDDIR)/libbfd.h \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fnmatch.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  sysdep.h
+objdump.o: \
+  objdump.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/dis-asm.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  dwarf.h \
+  sysdep.h
+prdbg.o: \
+  prdbg.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+rclex.o: \
+  rclex.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  rcparse.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+rdcoff.o: \
+  rdcoff.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+rddbg.o: \
+  rddbg.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+readelf.o: \
+  readelf.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/elf/alpha.h \
+  $(INCDIR)/elf/arc.h \
+  $(INCDIR)/elf/arm.h \
+  $(INCDIR)/elf/avr.h \
+  $(INCDIR)/elf/bfin.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/cr16.h \
+  $(INCDIR)/elf/cris.h \
+  $(INCDIR)/elf/crx.h \
+  $(INCDIR)/elf/d10v.h \
+  $(INCDIR)/elf/d30v.h \
+  $(INCDIR)/elf/dlx.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/fr30.h \
+  $(INCDIR)/elf/frv.h \
+  $(INCDIR)/elf/h8.h \
+  $(INCDIR)/elf/hppa.h \
+  $(INCDIR)/elf/i370.h \
+  $(INCDIR)/elf/i386.h \
+  $(INCDIR)/elf/i860.h \
+  $(INCDIR)/elf/i960.h \
+  $(INCDIR)/elf/ia64.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/ip2k.h \
+  $(INCDIR)/elf/iq2000.h \
+  $(INCDIR)/elf/lm32.h \
+  $(INCDIR)/elf/m32c.h \
+  $(INCDIR)/elf/m32r.h \
+  $(INCDIR)/elf/m68hc11.h \
+  $(INCDIR)/elf/m68k.h \
+  $(INCDIR)/elf/mcore.h \
+  $(INCDIR)/elf/mep.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/mmix.h \
+  $(INCDIR)/elf/mn10200.h \
+  $(INCDIR)/elf/mn10300.h \
+  $(INCDIR)/elf/msp430.h \
+  $(INCDIR)/elf/mt.h \
+  $(INCDIR)/elf/or32.h \
+  $(INCDIR)/elf/pj.h \
+  $(INCDIR)/elf/ppc.h \
+  $(INCDIR)/elf/ppc64.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/s390.h \
+  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/sparc.h \
+  $(INCDIR)/elf/spu.h \
+  $(INCDIR)/elf/v850.h \
+  $(INCDIR)/elf/vax.h \
+  $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/xstormy16.h \
+  $(INCDIR)/elf/xtensa.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dwarf.h \
+  sysdep.h \
+  unwind-ia64.h
+rename.o: \
+  rename.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+resbin.o: \
+  resbin.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+rescoff.o: \
+  rescoff.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+resrc.o: \
+  resrc.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+resres.o: \
+  resres.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+size.o: \
+  size.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+srconv.o: \
+  srconv.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h \
+  sysroff.c \
+  sysroff.h
+stabs.o: \
+  stabs.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+strings.o: \
+  strings.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+sysdump.o: \
+  sysdump.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  sysroff.c \
+  sysroff.h
+unwind-ia64.o: \
+  unwind-ia64.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/elf/ia64.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  unwind-ia64.h
+version.o: \
+  version.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+windres.o: \
+  windres.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+winduni.o: \
+  winduni.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  winduni.h
+wrstabs.o: \
+  wrstabs.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+windmc.o: \
+  windmc.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windmc.h \
+  winduni.h
+mclex.o: \
+  mclex.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  mcparse.h \
+  sysdep.h \
+  windmc.h \
+  winduni.h
+arparse.o: \
+  arparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  config.h \
+  sysdep.h
+arlex.o: \
+  arlex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/libiberty.h \
   arparse.h
-sysroff.o: sysroff.c
-sysinfo.o: sysinfo.c
-syslex.o: syslex.c config.h sysinfo.h
-defparse.o: defparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h dlltool.h
-deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  defparse.h dlltool.h
-nlmheader.o: nlmheader.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h $(INCDIR)/safe-ctype.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  bucomm.h nlmconv.h
-rcparse.o: rcparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h $(INCDIR)/safe-ctype.h
-mcparse.o: mcparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windmc.h winduni.h $(INCDIR)/safe-ctype.h
+sysroff.o: \
+  sysroff.c
+sysinfo.o: \
+  sysinfo.c
+syslex.o: \
+  syslex.c \
+  config.h \
+  sysinfo.h
+defparse.o: \
+  defparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  dlltool.h \
+  sysdep.h
+deflex.o: \
+  deflex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/libiberty.h \
+  defparse.h \
+  dlltool.h
+nlmheader.o: \
+  nlmheader.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/nlm/common.h \
+  $(INCDIR)/nlm/internal.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  nlmconv.h \
+  sysdep.h
+rcparse.o: \
+  rcparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+mcparse.o: \
+  mcparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windmc.h \
+  winduni.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 9f26b79..b123881 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1172,18 +1172,23 @@ all: info
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -1241,273 +1246,870 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-addr2line.o: addr2line.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h bucomm.h
-ar.o: ar.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/aout/ar.h \
-  $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h bucomm.h arsup.h \
-  $(INCDIR)/filenames.h binemul.h
-arsup.o: arsup.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/filenames.h bucomm.h \
-  arsup.h
-bin2c.o: bin2c.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-binemul.o: binemul.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-bucomm.o: bucomm.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h \
-  $(INCDIR)/hashtab.h bucomm.h
-coffdump.o: coffdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h coffgrok.h
-coffgrok.o: coffgrok.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  $(INCDIR)/bfdlink.h bucomm.h coffgrok.h
-cxxfilt.o: cxxfilt.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/safe-ctype.h \
-  bucomm.h
-dwarf.o: dwarf.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h $(INCDIR)/libiberty.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h dwarf.h
-debug.o: debug.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h debug.h
-dlltool.o: dlltool.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/dyn-string.h \
-  bucomm.h dlltool.h $(INCDIR)/safe-ctype.h
-dllwrap.o: dllwrap.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/dyn-string.h bucomm.h
-emul_aix.o: emul_aix.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
-emul_vanilla.o: emul_vanilla.c binemul.h sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-filemode.o: filemode.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-ieee.o: ieee.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/ieee.h $(INCDIR)/libiberty.h debug.h budbg.h \
-  $(INCDIR)/filenames.h
-is-ranlib.o: is-ranlib.c
-is-strip.o: is-strip.c
-maybe-ranlib.o: maybe-ranlib.c
-maybe-strip.o: maybe-strip.c
-nlmconv.o: nlmconv.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(BFDDIR)/libnlm.h \
-  $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
-  nlmconv.h bucomm.h
-nm.o: nm.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
-  $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h bucomm.h
-not-ranlib.o: not-ranlib.c
-not-strip.o: not-strip.c
-objcopy.o: objcopy.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h $(INCDIR)/libiberty.h bucomm.h \
-  budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
-  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/external.h $(INCDIR)/coff/pe.h
-objdump.o: objdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/progress.h \
-  bucomm.h dwarf.h $(INCDIR)/safe-ctype.h $(INCDIR)/dis-asm.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/filenames.h \
-  debug.h budbg.h $(INCDIR)/aout/aout64.h
-prdbg.o: prdbg.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/demangle.h debug.h \
-  budbg.h
-rclex.o: rclex.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windres.h winduni.h windint.h rcparse.h
-rdcoff.o: rdcoff.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/libiberty.h bucomm.h \
-  debug.h budbg.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
-rddbg.o: rddbg.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h debug.h budbg.h
-readelf.o: readelf.c config.h sysdep.h $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h dwarf.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/h8.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/alpha.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h \
-  $(INCDIR)/elf/avr.h $(INCDIR)/elf/bfin.h $(INCDIR)/elf/cr16.h \
-  $(INCDIR)/elf/cris.h $(INCDIR)/elf/crx.h $(INCDIR)/elf/d10v.h \
-  $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h $(INCDIR)/elf/fr30.h \
-  $(INCDIR)/elf/frv.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h \
-  $(INCDIR)/elf/i370.h $(INCDIR)/elf/i860.h $(INCDIR)/elf/i960.h \
-  $(INCDIR)/elf/ia64.h $(INCDIR)/elf/ip2k.h $(INCDIR)/elf/lm32.h \
-  $(INCDIR)/elf/iq2000.h $(INCDIR)/elf/m32c.h $(INCDIR)/elf/m32r.h \
-  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/m68hc11.h $(INCDIR)/elf/mcore.h \
-  $(INCDIR)/elf/mep.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/mmix.h \
-  $(INCDIR)/elf/mn10200.h $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/mt.h \
-  $(INCDIR)/elf/msp430.h $(INCDIR)/elf/or32.h $(INCDIR)/elf/pj.h \
-  $(INCDIR)/elf/ppc.h $(INCDIR)/elf/ppc64.h $(INCDIR)/elf/s390.h \
-  $(INCDIR)/elf/score.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/sparc.h \
-  $(INCDIR)/elf/spu.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
-  $(INCDIR)/elf/x86-64.h $(INCDIR)/elf/xstormy16.h $(INCDIR)/elf/xtensa.h \
-  $(INCDIR)/aout/ar.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/filenames.h unwind-ia64.h
-rename.o: rename.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-resbin.o: resbin.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h
-rescoff.o: rescoff.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  $(INCDIR)/bfdlink.h
-resrc.o: resrc.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windres.h winduni.h windint.h
-resres.o: resres.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h
-size.o: size.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h
-srconv.o: srconv.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h sysroff.h coffgrok.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
-  sysroff.c
-stabs.o: stabs.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/demangle.h \
-  debug.h budbg.h $(INCDIR)/filenames.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
-strings.o: strings.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h bucomm.h
-sysdump.o: sysdump.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h bucomm.h \
-  sysroff.h sysroff.c
-unwind-ia64.o: unwind-ia64.c unwind-ia64.h $(INCDIR)/elf/ia64.h \
-  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/ansidecl.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h
-version.o: version.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h
-windres.o: windres.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/obstack.h windres.h winduni.h windint.h
-winduni.o: winduni.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h bucomm.h winduni.h $(INCDIR)/safe-ctype.h
-wrstabs.o: wrstabs.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h bucomm.h \
-  debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def
-windmc.o: windmc.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/obstack.h windmc.h winduni.h windint.h
-mclex.o: mclex.c sysdep.h $(INCDIR)/alloca-conf.h config.h \
-  $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  windmc.h winduni.h mcparse.h
-arparse.o: arparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  arsup.h
-arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+addr2line.o: \
+  addr2line.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+ar.o: \
+  ar.c \
+  $(BFDDIR)/libbfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+arsup.o: \
+  arsup.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+bin2c.o: \
+  bin2c.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+binemul.o: \
+  binemul.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+bucomm.o: \
+  bucomm.c \
+  $(BFDDIR)/libbfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+coffdump.o: \
+  coffdump.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h
+coffgrok.o: \
+  coffgrok.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h
+cxxfilt.o: \
+  cxxfilt.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+dwarf.o: \
+  dwarf.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dwarf.h \
+  sysdep.h
+debug.o: \
+  debug.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  debug.h \
+  sysdep.h
+dlltool.o: \
+  dlltool.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/dyn-string.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dlltool.h \
+  sysdep.h
+dllwrap.o: \
+  dllwrap.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/dyn-string.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+emul_aix.o: \
+  emul_aix.c \
+  $(BFDDIR)/libcoff.h \
+  $(BFDDIR)/libxcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/xcoff.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+emul_vanilla.o: \
+  emul_vanilla.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  binemul.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+filemode.o: \
+  filemode.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+ieee.o: \
+  ieee.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/ieee.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+is-ranlib.o: \
+  is-ranlib.c
+is-strip.o: \
+  is-strip.c
+maybe-ranlib.o: \
+  maybe-ranlib.c
+maybe-strip.o: \
+  maybe-strip.c
+nlmconv.o: \
+  nlmconv.c \
+  $(BFDDIR)/libnlm.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/nlm/common.h \
+  $(INCDIR)/nlm/external.h \
+  $(INCDIR)/nlm/internal.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  nlmconv.h \
+  sysdep.h
+nm.o: \
+  nm.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ranlib.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+not-ranlib.o: \
+  not-ranlib.c
+not-strip.o: \
+  not-strip.c
+objcopy.o: \
+  objcopy.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(BFDDIR)/libbfd.h \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fnmatch.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  sysdep.h
+objdump.o: \
+  objdump.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/dis-asm.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  dwarf.h \
+  sysdep.h
+prdbg.o: \
+  prdbg.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+rclex.o: \
+  rclex.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  rcparse.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+rdcoff.o: \
+  rdcoff.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+rddbg.o: \
+  rddbg.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+readelf.o: \
+  readelf.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/elf/alpha.h \
+  $(INCDIR)/elf/arc.h \
+  $(INCDIR)/elf/arm.h \
+  $(INCDIR)/elf/avr.h \
+  $(INCDIR)/elf/bfin.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/cr16.h \
+  $(INCDIR)/elf/cris.h \
+  $(INCDIR)/elf/crx.h \
+  $(INCDIR)/elf/d10v.h \
+  $(INCDIR)/elf/d30v.h \
+  $(INCDIR)/elf/dlx.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/fr30.h \
+  $(INCDIR)/elf/frv.h \
+  $(INCDIR)/elf/h8.h \
+  $(INCDIR)/elf/hppa.h \
+  $(INCDIR)/elf/i370.h \
+  $(INCDIR)/elf/i386.h \
+  $(INCDIR)/elf/i860.h \
+  $(INCDIR)/elf/i960.h \
+  $(INCDIR)/elf/ia64.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/ip2k.h \
+  $(INCDIR)/elf/iq2000.h \
+  $(INCDIR)/elf/lm32.h \
+  $(INCDIR)/elf/m32c.h \
+  $(INCDIR)/elf/m32r.h \
+  $(INCDIR)/elf/m68hc11.h \
+  $(INCDIR)/elf/m68k.h \
+  $(INCDIR)/elf/mcore.h \
+  $(INCDIR)/elf/mep.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/mmix.h \
+  $(INCDIR)/elf/mn10200.h \
+  $(INCDIR)/elf/mn10300.h \
+  $(INCDIR)/elf/msp430.h \
+  $(INCDIR)/elf/mt.h \
+  $(INCDIR)/elf/or32.h \
+  $(INCDIR)/elf/pj.h \
+  $(INCDIR)/elf/ppc.h \
+  $(INCDIR)/elf/ppc64.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/s390.h \
+  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/sparc.h \
+  $(INCDIR)/elf/spu.h \
+  $(INCDIR)/elf/v850.h \
+  $(INCDIR)/elf/vax.h \
+  $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/xstormy16.h \
+  $(INCDIR)/elf/xtensa.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  dwarf.h \
+  sysdep.h \
+  unwind-ia64.h
+rename.o: \
+  rename.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+resbin.o: \
+  resbin.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+rescoff.o: \
+  rescoff.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+resrc.o: \
+  resrc.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+resres.o: \
+  resres.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+size.o: \
+  size.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+srconv.o: \
+  srconv.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  coffgrok.h \
+  config.h \
+  sysdep.h \
+  sysroff.c \
+  sysroff.h
+stabs.o: \
+  stabs.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+strings.o: \
+  strings.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+sysdump.o: \
+  sysdump.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  sysroff.c \
+  sysroff.h
+unwind-ia64.o: \
+  unwind-ia64.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/elf/ia64.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  unwind-ia64.h
+version.o: \
+  version.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h
+windres.o: \
+  windres.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+winduni.o: \
+  winduni.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  winduni.h
+wrstabs.o: \
+  wrstabs.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  budbg.h \
+  config.h \
+  debug.h \
+  sysdep.h
+windmc.o: \
+  windmc.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windmc.h \
+  winduni.h
+mclex.o: \
+  mclex.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  mcparse.h \
+  sysdep.h \
+  windmc.h \
+  winduni.h
+arparse.o: \
+  arparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  arsup.h \
+  config.h \
+  sysdep.h
+arlex.o: \
+  arlex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/libiberty.h \
   arparse.h
-sysroff.o: sysroff.c
-sysinfo.o: sysinfo.c
-syslex.o: syslex.c config.h sysinfo.h
-defparse.o: defparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h dlltool.h
-deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
-  defparse.h dlltool.h
-nlmheader.o: nlmheader.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h $(INCDIR)/safe-ctype.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  bucomm.h nlmconv.h
-rcparse.o: rcparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windres.h winduni.h \
-  windint.h $(INCDIR)/safe-ctype.h
-mcparse.o: mcparse.c sysdep.h $(INCDIR)/alloca-conf.h \
-  config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  bucomm.h $(INCDIR)/libiberty.h windmc.h winduni.h $(INCDIR)/safe-ctype.h
+sysroff.o: \
+  sysroff.c
+sysinfo.o: \
+  sysinfo.c
+syslex.o: \
+  syslex.c \
+  config.h \
+  sysinfo.h
+defparse.o: \
+  defparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  dlltool.h \
+  sysdep.h
+deflex.o: \
+  deflex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/libiberty.h \
+  defparse.h \
+  dlltool.h
+nlmheader.o: \
+  nlmheader.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/nlm/common.h \
+  $(INCDIR)/nlm/internal.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  nlmconv.h \
+  sysdep.h
+rcparse.o: \
+  rcparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windint.h \
+  windres.h \
+  winduni.h
+mcparse.o: \
+  mcparse.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  bucomm.h \
+  config.h \
+  sysdep.h \
+  windmc.h \
+  winduni.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/binutils/dep-in.sed b/binutils/dep-in.sed
index c30c396..0461228 100644
--- a/binutils/dep-in.sed
+++ b/binutils/dep-in.sed
@@ -1,6 +1,7 @@
 :loop
 /\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
 
 s! \./! !g
 s!@INCDIR@!$(INCDIR)!g
@@ -11,11 +12,8 @@ s!@SRCDIR@/!!g
 s!@OBJDIR@/!!g
 s! \.\./intl/libintl\.h!!g
 
-s/\\\n */ /g
-
 s/ *$//
 s/  */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
-  /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index c7ae638..f5c52d9 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* dep-in.sed: Output one filename per line with all lines having
+	continuation backslash.  Prefix first line with "A", following
+	lines with "B".
+	* Makefile.am (DEP): Don't use dep.sed here.
+	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
+	sort and uniq.
+	* Makefile.in: Regenerate.
+
 2009-05-22  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 559723a..a2a4217 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -181,18 +181,23 @@ install-data-local: install-info
 DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(gprof_SOURCES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -234,111 +239,397 @@ endif
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h basic_blocks.h corefile.h gmon_io.h \
-  gmon_out.h search_list.h source.h symtab.h sym_ids.h
-call_graph.o: call_graph.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h call_graph.h \
-  corefile.h gmon_io.h gmon_out.h sym_ids.h
-cg_arcs.o: cg_arcs.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \
-  sym_ids.h
-cg_dfn.o: cg_dfn.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_dfn.h utils.h
-cg_print.o: cg_print.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_print.h hist.h utils.h corefile.h
-corefile.o: corefile.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  hist.h corefile.h $(INCDIR)/safe-ctype.h
-gmon_io.o: gmon_io.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/binary-io.h search_list.h source.h symtab.h \
-  cg_arcs.h basic_blocks.h corefile.h call_graph.h gmon_io.h \
-  gmon_out.h gmon.h hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h ../bfd/bfdver.h search_list.h \
-  source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \
-  cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \
-  $(INCDIR)/demangle.h
-hertz.o: hertz.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+basic_blocks.o: \
+  basic_blocks.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+call_graph.o: \
+  call_graph.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+cg_arcs.o: \
+  cg_arcs.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  cg_print.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+cg_dfn.o: \
+  cg_dfn.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+cg_print.o: \
+  cg_print.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+corefile.o: \
+  corefile.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gmon_io.o: \
+  gmon_io.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gprof.o: \
+  gprof.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+hertz.o: \
+  hertz.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
   hertz.h
-hist.o: hist.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h
-source.o: source.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h
-search_list.o: search_list.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h
-symtab.o: symtab.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h
-sym_ids.o: sym_ids.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h search_list.h \
-  source.h symtab.h cg_arcs.h sym_ids.h corefile.h
-utils.o: utils.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/demangle.h $(INCDIR)/libiberty.h search_list.h \
-  source.h symtab.h cg_arcs.h utils.h corefile.h
-i386.o: i386.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-alpha.o: alpha.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-vax.o: vax.c gprof.h gconfig.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h search_list.h source.h \
-  symtab.h cg_arcs.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-sparc.o: sparc.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-mips.o: mips.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
-bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
-fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
+hist.o: \
+  hist.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+source.o: \
+  source.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h
+search_list.o: \
+  search_list.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h
+symtab.o: \
+  symtab.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sym_ids.o: \
+  sym_ids.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+utils.o: \
+  utils.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+i386.o: \
+  i386.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+alpha.o: \
+  alpha.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+vax.o: \
+  vax.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+tahoe.o: \
+  tahoe.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sparc.o: \
+  sparc.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+mips.o: \
+  mips.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+flat_bl.o: \
+  flat_bl.c \
+  $(INCDIR)/ansidecl.h
+bsd_callg_bl.o: \
+  bsd_callg_bl.c \
+  $(INCDIR)/ansidecl.h
+fsf_callg_bl.o: \
+  fsf_callg_bl.c \
+  $(INCDIR)/ansidecl.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 7095370..a9dc920 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -953,18 +953,23 @@ install-data-local: install-info
 DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(gprof_SOURCES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -995,113 +1000,399 @@ dep-am: DEP
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h basic_blocks.h corefile.h gmon_io.h \
-  gmon_out.h search_list.h source.h symtab.h sym_ids.h
-call_graph.o: call_graph.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h call_graph.h \
-  corefile.h gmon_io.h gmon_out.h sym_ids.h
-cg_arcs.o: cg_arcs.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \
-  sym_ids.h
-cg_dfn.o: cg_dfn.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_dfn.h utils.h
-cg_print.o: cg_print.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h cg_print.h hist.h utils.h corefile.h
-corefile.o: corefile.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  hist.h corefile.h $(INCDIR)/safe-ctype.h
-gmon_io.o: gmon_io.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/binary-io.h search_list.h source.h symtab.h \
-  cg_arcs.h basic_blocks.h corefile.h call_graph.h gmon_io.h \
-  gmon_out.h gmon.h hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h ../bfd/bfdver.h search_list.h \
-  source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \
-  cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \
-  $(INCDIR)/demangle.h
-hertz.o: hertz.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+basic_blocks.o: \
+  basic_blocks.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+call_graph.o: \
+  call_graph.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+cg_arcs.o: \
+  cg_arcs.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  cg_print.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+cg_dfn.o: \
+  cg_dfn.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_dfn.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+cg_print.o: \
+  cg_print.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+corefile.o: \
+  corefile.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gmon_io.o: \
+  gmon_io.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/binary-io.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gmon.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+gprof.o: \
+  gprof.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  ../bfd/config.h \
+  basic_blocks.h \
+  call_graph.h \
+  cg_arcs.h \
+  cg_print.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gprof.h \
+  hertz.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+hertz.o: \
+  hertz.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
   hertz.h
-hist.o: hist.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h
-source.o: source.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h source.h
-search_list.o: search_list.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h search_list.h
-symtab.o: symtab.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h
-sym_ids.o: sym_ids.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h search_list.h \
-  source.h symtab.h cg_arcs.h sym_ids.h corefile.h
-utils.o: utils.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  $(INCDIR)/demangle.h $(INCDIR)/libiberty.h search_list.h \
-  source.h symtab.h cg_arcs.h utils.h corefile.h
-i386.o: i386.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-alpha.o: alpha.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-vax.o: vax.c gprof.h gconfig.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h search_list.h source.h \
-  symtab.h cg_arcs.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-sparc.o: sparc.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-mips.o: mips.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
-  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  search_list.h source.h symtab.h cg_arcs.h corefile.h \
-  hist.h
-flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
-bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
-fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
+hist.o: \
+  hist.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  corefile.h \
+  gconfig.h \
+  gmon_io.h \
+  gmon_out.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h \
+  utils.h
+source.o: \
+  source.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h
+search_list.o: \
+  search_list.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h
+symtab.o: \
+  symtab.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sym_ids.o: \
+  sym_ids.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  sym_ids.h \
+  symtab.h
+utils.o: \
+  utils.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  search_list.h \
+  source.h \
+  symtab.h \
+  utils.h
+i386.o: \
+  i386.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+alpha.o: \
+  alpha.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+vax.o: \
+  vax.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+tahoe.o: \
+  tahoe.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+sparc.o: \
+  sparc.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+mips.o: \
+  mips.c \
+  $(BFDDIR)/sysdep.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/config.h \
+  cg_arcs.h \
+  corefile.h \
+  gconfig.h \
+  gprof.h \
+  hist.h \
+  search_list.h \
+  source.h \
+  symtab.h
+flat_bl.o: \
+  flat_bl.c \
+  $(INCDIR)/ansidecl.h
+bsd_callg_bl.o: \
+  bsd_callg_bl.c \
+  $(INCDIR)/ansidecl.h
+fsf_callg_bl.o: \
+  fsf_callg_bl.c \
+  $(INCDIR)/ansidecl.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gprof/dep-in.sed b/gprof/dep-in.sed
index aeb22a1..0461228 100644
--- a/gprof/dep-in.sed
+++ b/gprof/dep-in.sed
@@ -1,7 +1,9 @@
 :loop
 /\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
 
+s! \./! !g
 s!@INCDIR@!$(INCDIR)!g
 s!@TOPDIR@/include!$(INCDIR)!g
 s!@BFDDIR@!$(BFDDIR)!g
@@ -10,11 +12,8 @@ s!@SRCDIR@/!!g
 s!@OBJDIR@/!!g
 s! \.\./intl/libintl\.h!!g
 
-s/\\\n */ /g
-
 s/ *$//
 s/  */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
-  /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
diff --git a/ld/ChangeLog b/ld/ChangeLog
index ded1d2a..e2fcb99 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,15 @@
 2009-05-26  Alan Modra  <amodra@bigpond.net.au>
 
+	* dep-in.sed: Output one filename per line with all lines having
+	continuation backslash.  Prefix first line with "A", following
+	lines with "B".
+	* Makefile.am (DEP): Don't use dep.sed here.
+	(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
+	sort and uniq.
+	* Makefile.in: Regenerate.
+
+2009-05-26  Alan Modra  <amodra@bigpond.net.au>
+
 	* ldlang.c (lang_check_section_addresses): Ignore non-alloc sections.
 
 2009-05-22  Julian Brown  <julian@codesourcery.com>
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 670c1ed..7cf1b36 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -2009,18 +2009,23 @@ endif
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -2051,85 +2056,339 @@ dep-am: DEP
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-ldctor.o: ldctor.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h ldexp.h \
-  ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h
-ldemul.o: ldemul.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldmisc.h ldexp.h ldlang.h \
-  ldfile.h ldemul.h ldmain.h ldemul-list.h
-ldexp.o: ldexp.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlex.h ldgram.h ldlang.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-ldfile.o: ldfile.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h ldmisc.h \
-  ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h ldlex.h \
-  ldemul.h $(INCDIR)/libiberty.h $(INCDIR)/filenames.h
-ldlang.o: ldlang.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldexp.h ldlang.h \
-  ldgram.h ldlex.h ldmisc.h ldctor.h ldfile.h ldemul.h \
-  $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h $(INCDIR)/hashtab.h
-ldmain.o: ldmain.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h ldmain.h \
-  ldmisc.h ldwrite.h ldexp.h ldlang.h ldgram.h ldlex.h \
-  ldfile.h ldemul.h ldctor.h
-ldmisc.o: ldmisc.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  ld.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h \
-  ldfile.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h
-ldver.o: ldver.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ../bfd/bfdver.h ld.h ldver.h ldexp.h ldlang.h ldfile.h \
-  ldemul.h ldmain.h
-ldwrite.o: ldwrite.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h
-lexsup.o: lexsup.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ../bfd/bfdver.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \
-  $(INCDIR)/demangle.h
-mri.o: mri.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ld.h ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h
-ldcref.o: ldcref.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  $(INCDIR)/objalloc.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlang.h
-pe-dll.o: pe-dll.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \
-  ldfile.h ldemul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  deffile.h pe-dll.h
-pep-dll.o: pep-dll.c pe-dll.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \
-  ldfile.h ldemul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  deffile.h pep-dll.h
-ldgram.o: ldgram.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldfile.h \
-  ldemul.h ldmisc.h ldmain.h mri.h ldctor.h ldlex.h
-ldlex.o: ldlex.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h ldmisc.h \
-  ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h ldmain.h \
-  $(INCDIR)/libiberty.h
-deffilep.o: deffilep.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h ld.h ldmisc.h deffile.h
+ldctor.o: \
+  ldctor.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldemul.o: \
+  ldemul.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldemul-list.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldexp.o: \
+  ldexp.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldfile.o: \
+  ldfile.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldlang.o: \
+  ldlang.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fnmatch.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldmain.o: \
+  ldmain.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  sysdep.h
+ldmisc.o: \
+  ldmisc.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldver.o: \
+  ldver.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldmain.h \
+  ldver.h \
+  sysdep.h
+ldwrite.o: \
+  ldwrite.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  sysdep.h
+lexsup.o: \
+  lexsup.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldver.h \
+  sysdep.h
+mri.o: \
+  mri.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmisc.h \
+  mri.h \
+  sysdep.h
+ldcref.o: \
+  ldcref.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/objalloc.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+pe-dll.o: \
+  pe-dll.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  pe-dll.h \
+  sysdep.h
+pep-dll.o: \
+  pep-dll.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  pe-dll.c \
+  pep-dll.h \
+  sysdep.h
+ldgram.o: \
+  ldgram.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldver.h \
+  mri.h \
+  sysdep.h
+ldlex.o: \
+  ldlex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+deffilep.o: \
+  deffilep.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldmisc.h \
+  sysdep.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 6aa9db1..3121f34 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2814,18 +2814,23 @@ distclean-local:
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
 	rm -f DEP1
 	$(MAKE) MKDEP="$(MKDEP)" DEP1
-	sed -f dep.sed < DEP1 > DEPA
-	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
-	if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+	echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+	if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
 	  echo 'make DEP failed!'; exit 1; \
 	else \
-	  mv -f DEPA $@; \
+	  mv -f DEP1 $@; \
 	fi
 
 DEP1: $(CFILES) $(GENERATED_CFILES)
 	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
 	echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
-	$(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+	for f in $?; do \
+	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+	  sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
+	done
+	rm -f DEPA
 	mv -f DEP2 $@
 
 dep.sed: dep-in.sed config.status
@@ -2856,87 +2861,341 @@ dep-am: DEP
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-ldctor.o: ldctor.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h ldexp.h \
-  ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h
-ldemul.o: ldemul.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldmisc.h ldexp.h ldlang.h \
-  ldfile.h ldemul.h ldmain.h ldemul-list.h
-ldexp.o: ldexp.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlex.h ldgram.h ldlang.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-ldfile.o: ldfile.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h ldmisc.h \
-  ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h ldlex.h \
-  ldemul.h $(INCDIR)/libiberty.h $(INCDIR)/filenames.h
-ldlang.o: ldlang.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldexp.h ldlang.h \
-  ldgram.h ldlex.h ldmisc.h ldctor.h ldfile.h ldemul.h \
-  $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h $(INCDIR)/hashtab.h
-ldmain.o: ldmain.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h ldmain.h \
-  ldmisc.h ldwrite.h ldexp.h ldlang.h ldgram.h ldlex.h \
-  ldfile.h ldemul.h ldctor.h
-ldmisc.o: ldmisc.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  ld.h ldmisc.h ldexp.h ldlang.h ldgram.h ldlex.h ldmain.h \
-  ldfile.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h
-ldver.o: ldver.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ../bfd/bfdver.h ld.h ldver.h ldexp.h ldlang.h ldfile.h \
-  ldemul.h ldmain.h
-ldwrite.o: ldwrite.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h
-lexsup.o: lexsup.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ../bfd/bfdver.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  $(INCDIR)/bfdlink.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \
-  $(INCDIR)/demangle.h
-mri.o: mri.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  ld.h ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h
-ldcref.o: ldcref.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  $(INCDIR)/objalloc.h ld.h ldmain.h ldmisc.h ldexp.h \
-  ldlang.h
-pe-dll.o: pe-dll.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \
-  ldfile.h ldemul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  deffile.h pe-dll.h
-pep-dll.o: pep-dll.c pe-dll.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h ldexp.h ldlang.h ldwrite.h ldmisc.h ldgram.h ldmain.h \
-  ldfile.h ldemul.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
-  deffile.h pep-dll.h
-ldgram.o: ldgram.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldfile.h \
-  ldemul.h ldmisc.h ldmain.h mri.h ldctor.h ldlex.h
-ldlex.o: ldlex.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h ldmisc.h \
-  ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h ldmain.h \
-  $(INCDIR)/libiberty.h
-deffilep.o: deffilep.c sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h ld.h ldmisc.h deffile.h
+ldctor.o: \
+  ldctor.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldemul.o: \
+  ldemul.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldemul-list.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldexp.o: \
+  ldexp.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldfile.o: \
+  ldfile.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldlang.o: \
+  ldlang.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fnmatch.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/obstack.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldmain.o: \
+  ldmain.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/progress.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  sysdep.h
+ldmisc.o: \
+  ldmisc.c \
+  $(BFDDIR)/elf-bfd.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+ldver.o: \
+  ldver.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldmain.h \
+  ldver.h \
+  sysdep.h
+ldwrite.o: \
+  ldwrite.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  sysdep.h
+lexsup.o: \
+  lexsup.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  ../bfd/bfdver.h \
+  config.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldver.h \
+  sysdep.h
+mri.o: \
+  mri.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldgram.h \
+  ldlang.h \
+  ldmisc.h \
+  mri.h \
+  sysdep.h
+ldcref.o: \
+  ldcref.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/objalloc.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+pe-dll.o: \
+  pe-dll.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  pe-dll.h \
+  sysdep.h
+pep-dll.o: \
+  pep-dll.c \
+  $(BFDDIR)/libcoff.h \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldmain.h \
+  ldmisc.h \
+  ldwrite.h \
+  pe-dll.c \
+  pep-dll.h \
+  sysdep.h
+ldgram.o: \
+  ldgram.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldctor.h \
+  ldemul.h \
+  ldexp.h \
+  ldfile.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  ldver.h \
+  mri.h \
+  sysdep.h
+ldlex.o: \
+  ldlex.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  ld.h \
+  ldexp.h \
+  ldfile.h \
+  ldgram.h \
+  ldlang.h \
+  ldlex.h \
+  ldmain.h \
+  ldmisc.h \
+  sysdep.h
+deffilep.o: \
+  deffilep.c \
+  $(INCDIR)/ansidecl.h \
+  $(INCDIR)/fopen-same.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/symcat.h \
+  ../bfd/bfd.h \
+  config.h \
+  deffile.h \
+  ld.h \
+  ldmisc.h \
+  sysdep.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/ld/dep-in.sed b/ld/dep-in.sed
index 0bf6ffe..e51593b 100644
--- a/ld/dep-in.sed
+++ b/ld/dep-in.sed
@@ -1,6 +1,7 @@
 :loop
 /\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
 
 s! \./! !g
 s!@INCDIR@!$(INCDIR)!g
@@ -11,11 +12,8 @@ s!@SRCDIR@/!!g
 s! \.\./bfd/hosts/[^ ]*\.h! !g
 s! \.\./intl/libintl\.h!!g
 
-s/\\\n */ /g
-
 s/ *$//
 s/  */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
-  /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/