This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
Re: makefile dependency revamp

From: Alan Modra <amodra at bigpond dot net dot au>
To: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
Cc: binutils at sourceware dot org
Date: Thu, 4 Jun 2009 16:28:15 +0930
Subject: Re: makefile dependency revamp
References: <20090526033837.GG1387@bubble.grove.modra.org> <20090603183902.GA20960@gmx.de>
On Wed, Jun 03, 2009 at 08:39:02PM +0200, Ralf Wildenhues wrote:
> Is there anything wrong with automatic dependency tracking?
> Why is the only directory in src that uses automatice dependency
> tracking (gdb) the one that does not use automake?

If automake's dependency generation "just works" for most non-gcc
compilers in use, I'd be happy to throw away the current "make dep"
scheme.

> PS: see a couple of bugs below;

Thanks!

bfd/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1): LC_ALL for uniq.
	Run "make dep-am".
	* Makefile.in: Regenerate.
binutils/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1): LC_ALL for uniq.
	Run "make dep-am".
	* Makefile.in: Regenerate.
gas/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1, DEPTC, DEPOBJ, DEP2): LC_ALL for uniq.
	* Makefile.in: Regenerate.
gprof/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1): LC_ALL for uniq.
	* Makefile.in: Regenerate.
ld/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1): LC_ALL for uniq.
	* Makefile.in: Regenerate.
opcodes/
	* dep-in.sed: Don't use \n in replacement part of s command.
	* Makefile.am (DEP1): LC_ALL for uniq.
	* Makefile.in: Regenerate.

Index: bfd/dep-in.sed
===================================================================
RCS file: /cvs/src/src/bfd/dep-in.sed,v
retrieving revision 1.8
diff -u -p -r1.8 dep-in.sed
--- bfd/dep-in.sed	26 May 2009 03:19:15 -0000	1.8
+++ bfd/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -23,5 +23,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.229
diff -u -p -r1.229 Makefile.am
--- bfd/Makefile.am	26 May 2009 14:12:02 -0000	1.229
+++ bfd/Makefile.am	4 Jun 2009 05:45:20 -0000
@@ -930,7 +930,8 @@ DEP1: $(CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -1252,14 +1253,14 @@ cpu-cr16.lo: \
   cpu-cr16.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-cris.lo: \
-  cpu-cris.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-cr16c.lo: \
   cpu-cr16c.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-cris.lo: \
+  cpu-cris.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-crx.lo: \
   cpu-crx.c \
   $(INCDIR)/filenames.h \
@@ -1296,13 +1297,6 @@ cpu-hppa.lo: \
   cpu-hppa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-ia64.lo: \
-  cpu-ia64.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/ia64.h \
-  $(srcdir)/../opcodes/ia64-opc.h \
-  cpu-ia64-opc.c
 cpu-i370.lo: \
   cpu-i370.c \
   $(INCDIR)/filenames.h \
@@ -1319,6 +1313,13 @@ cpu-i960.lo: \
   cpu-i960.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-ia64.lo: \
+  cpu-ia64.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/ia64.h \
+  $(srcdir)/../opcodes/ia64-opc.h \
+  cpu-ia64-opc.c
 cpu-ip2k.lo: \
   cpu-ip2k.c \
   $(INCDIR)/filenames.h \
@@ -1331,6 +1332,14 @@ cpu-lm32.lo: \
   cpu-lm32.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-m10200.lo: \
+  cpu-m10200.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
+cpu-m10300.lo: \
+  cpu-m10300.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-m32c.lo: \
   cpu-m32c.c \
   $(INCDIR)/filenames.h \
@@ -1356,14 +1365,6 @@ cpu-m88k.lo: \
   cpu-m88k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-m10200.lo: \
-  cpu-m10200.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
-cpu-m10300.lo: \
-  cpu-m10300.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-maxq.lo: \
   cpu-maxq.c \
   $(INCDIR)/filenames.h \
@@ -1396,10 +1397,6 @@ cpu-mt.lo: \
   cpu-mt.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-or32.lo: \
-  cpu-or32.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-ns32k.lo: \
   cpu-ns32k.c \
   $(INCDIR)/filenames.h \
@@ -1409,6 +1406,10 @@ cpu-openrisc.lo: \
   cpu-openrisc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-or32.lo: \
+  cpu-or32.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-pdp11.lo: \
   cpu-pdp11.c \
   $(INCDIR)/filenames.h \
@@ -1475,12 +1476,16 @@ cpu-vax.lo: \
   cpu-vax.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-w65.lo: \
+  cpu-w65.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-we32k.lo: \
   cpu-we32k.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-w65.lo: \
-  cpu-w65.c \
+cpu-xc16x.lo: \
+  cpu-xc16x.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
 cpu-xstormy16.lo: \
@@ -1491,10 +1496,6 @@ cpu-xtensa.lo: \
   cpu-xtensa.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-xc16x.lo: \
-  cpu-xc16x.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-z80.lo: \
   cpu-z80.c \
   $(INCDIR)/filenames.h \
@@ -1684,6 +1685,18 @@ coff-aux.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
+coff-go32.lo: \
+  coff-go32.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  coff-i386.c \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff-h8300.lo: \
   coff-h8300.c \
   $(INCDIR)/bfdlink.h \
@@ -1730,18 +1743,6 @@ coff-i860.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-go32.lo: \
-  coff-go32.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  coff-i386.c \
-  coffcode.h \
-  coffswap.h \
-  libcoff.h
 coff-i960.lo: \
   coff-i960.c \
   $(INCDIR)/bfdlink.h \
@@ -1928,23 +1929,23 @@ coff-u68k.lo: \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-we32k.lo: \
-  coff-we32k.c \
+coff-w65.lo: \
+  coff-w65.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/we32k.h \
+  $(INCDIR)/coff/w65.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
   coffswap.h \
   libcoff.h
-coff-w65.lo: \
-  coff-w65.c \
+coff-we32k.lo: \
+  coff-we32k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/w65.h \
+  $(INCDIR)/coff/we32k.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   coffcode.h \
@@ -2023,6 +2024,70 @@ ecofflink.lo: \
   $(INCDIR)/objalloc.h \
   libcoff.h \
   libecoff.h
+elf-attrs.lo: \
+  elf-attrs.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-eh-frame.lo: \
+  elf-eh-frame.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h
+elf-m10200.lo: \
+  elf-m10200.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-m10300.lo: \
+  elf-m10300.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mn10300.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-target.h
+elf-strtab.lo: \
+  elf-strtab.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h
+elf-vxworks.lo: \
+  elf-vxworks.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/vxworks.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf-vxworks.h
 elf.lo: \
   elf.c \
   $(INCDIR)/bfdlink.h \
@@ -2359,19 +2424,6 @@ elf32-m32r.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-m68k.lo: \
-  elf32-m68k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/m68k.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/m68k.h \
-  elf-bfd.h \
-  elf32-target.h
 elf32-m68hc11.lo: \
   elf32-m68hc11.c \
   $(INCDIR)/bfdlink.h \
@@ -2414,37 +2466,27 @@ elf32-m68hc1x.lo: \
   $(INCDIR)/opcode/m68hc11.h \
   elf-bfd.h \
   elf32-m68hc1x.h
-elf32-m88k.lo: \
-  elf32-m88k.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf32-target.h
-elf-m10200.lo: \
-  elf-m10200.c \
+elf32-m68k.lo: \
+  elf32-m68k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/m68k.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/m68k.h \
   elf-bfd.h \
   elf32-target.h
-elf-m10300.lo: \
-  elf-m10300.c \
+elf32-m88k.lo: \
+  elf32-m88k.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mn10300.h \
-  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
 elf32-mcore.lo: \
@@ -2472,25 +2514,6 @@ elf32-mep.lo: \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elfxx-mips.lo: \
-  elfxx-mips.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  elf-bfd.h \
-  elf-vxworks.h \
-  elfxx-mips.h
 elf32-mips.lo: \
   elf32-mips.c \
   $(INCDIR)/bfdlink.h \
@@ -2602,27 +2625,20 @@ elf32-ppc.lo: \
   elf-vxworks.h \
   elf32-ppc.h \
   elf32-target.h
-elf32-sh64.lo: \
-  elf32-sh64.c \
+elf32-s390.lo: \
+  elf32-s390.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/s390.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-sh64.h \
   elf32-target.h
-elf32-sh64-com.lo: \
-  elf32-sh64-com.c \
+elf32-sh-symbian.lo: \
+  elf32-sh-symbian.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -2631,20 +2647,12 @@ elf32-sh64-com.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(srcdir)/../opcodes/sh64-opc.h \
-  elf-bfd.h \
-  elf32-sh64.h
-elf32-s390.lo: \
-  elf32-s390.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/s390.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(srcdir)/../opcodes/sh-opc.h \
   elf-bfd.h \
+  elf-vxworks.h \
+  elf32-sh-relocs.h \
+  elf32-sh.c \
   elf32-target.h
 elf32-sh.lo: \
   elf32-sh.c \
@@ -2662,8 +2670,8 @@ elf32-sh.lo: \
   elf-vxworks.h \
   elf32-sh-relocs.h \
   elf32-target.h
-elf32-sh-symbian.lo: \
-  elf32-sh-symbian.c \
+elf32-sh64-com.lo: \
+  elf32-sh64-com.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
@@ -2672,28 +2680,28 @@ elf32-sh-symbian.lo: \
   $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
-  elf-vxworks.h \
-  elf32-sh-relocs.h \
-  elf32-sh.c \
-  elf32-target.h
-elfxx-sparc.lo: \
-  elfxx-sparc.c \
+  elf32-sh64.h
+elf32-sh64.lo: \
+  elf32-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(srcdir)/../opcodes/sh-opc.h \
+  $(srcdir)/../opcodes/sh64-opc.h \
   elf-bfd.h \
   elf-vxworks.h \
-  elfxx-sparc.h
+  elf32-sh-relocs.h \
+  elf32-sh.c \
+  elf32-sh64.h \
+  elf32-target.h
 elf32-sparc.lo: \
   elf32-sparc.c \
   $(INCDIR)/bfdlink.h \
@@ -2748,45 +2756,45 @@ elf32-vax.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xstormy16.lo: \
-  elf32-xstormy16.c \
+elf32-xc16x.lo: \
+  elf32-xc16x.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xstormy16.h \
+  $(INCDIR)/elf/xc16x.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xtensa.lo: \
-  elf32-xtensa.c \
+elf32-xstormy16.lo: \
+  elf32-xstormy16.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xtensa.h \
+  $(INCDIR)/elf/xstormy16.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/xtensa-config.h \
-  $(INCDIR)/xtensa-isa.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
-elf32-xc16x.lo: \
-  elf32-xc16x.c \
+elf32-xtensa.lo: \
+  elf32-xtensa.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/xc16x.h \
+  $(INCDIR)/elf/xtensa.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/xtensa-config.h \
+  $(INCDIR)/xtensa-isa.h \
   elf-bfd.h \
   elf32-target.h
 elf32.lo: \
@@ -2813,47 +2821,40 @@ elflink.lo: \
   $(INCDIR)/objalloc.h \
   $(INCDIR)/safe-ctype.h \
   elf-bfd.h
-elf-attrs.lo: \
-  elf-attrs.c \
+elfxx-mips.lo: \
+  elfxx-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-strtab.lo: \
-  elf-strtab.c \
+  elf-bfd.h \
+  elf-vxworks.h \
+  elfxx-mips.h
+elfxx-sparc.lo: \
+  elfxx-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
-  elf-bfd.h
-elf-eh-frame.lo: \
-  elf-eh-frame.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/dwarf2.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h
-elf-vxworks.lo: \
-  elf-vxworks.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/vxworks.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf-vxworks.h
+  elf-vxworks.h \
+  elfxx-sparc.h
 epoc-pe-arm.lo: \
   epoc-pe-arm.c \
   $(INCDIR)/bfdlink.h \
@@ -2909,10 +2910,6 @@ hp300hpux.lo: \
   aout-target.h \
   aoutx.h \
   libaout.h
-som.lo: \
-  som.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/filenames.h
 i386aout.lo: \
   i386aout.c \
   $(INCDIR)/aout/aout64.h \
@@ -2983,6 +2980,17 @@ i386lynx.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+i386mach3.lo: \
+  i386mach3.c \
+  $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/ar.h \
+  $(INCDIR)/aout/stab.def \
+  $(INCDIR)/aout/stab_gnu.h \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  aout-target.h \
+  libaout.h
 i386msdos.lo: \
   i386msdos.c \
   $(INCDIR)/bfdlink.h \
@@ -3001,17 +3009,6 @@ i386netbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-i386mach3.lo: \
-  i386mach3.c \
-  $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  aout-target.h \
-  libaout.h
 i386os9k.lo: \
   i386os9k.c \
   $(INCDIR)/bfdlink.h \
@@ -3134,25 +3131,25 @@ nlm32-i386.lo: \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-sparc.lo: \
-  nlm32-sparc.c \
+nlm32-ppc.lo: \
+  nlm32-ppc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/sparc32-ext.h \
+  $(INCDIR)/nlm/ppc-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
-nlm32-ppc.lo: \
-  nlm32-ppc.c \
+nlm32-sparc.lo: \
+  nlm32-sparc.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/nlm/common.h \
   $(INCDIR)/nlm/external.h \
   $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/ppc-ext.h \
+  $(INCDIR)/nlm/sparc32-ext.h \
   libnlm.h \
   nlm-target.h \
   nlmswap.h
@@ -3207,16 +3204,8 @@ pdp11.lo: \
   $(INCDIR)/safe-ctype.h \
   aout-target.h \
   libaout.h
-pef.lo: \
-  pef.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  $(INCDIR)/safe-ctype.h \
-  pef-traceback.h \
-  pef.h
-pe-arm.lo: \
-  pe-arm.c \
+pe-arm-wince.lo: \
+  pe-arm-wince.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3228,9 +3217,10 @@ pe-arm.lo: \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pe-arm.c \
   peicode.h
-pei-arm.lo: \
-  pei-arm.c \
+pe-arm.lo: \
+  pe-arm.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
@@ -3243,184 +3233,191 @@ pei-arm.lo: \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-arm-wince.lo: \
-  pe-arm-wince.c \
+pe-i386.lo: \
+  pe-i386.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-arm.c \
   peicode.h
-pei-arm-wince.lo: \
-  pei-arm-wince.c \
+pe-mcore.lo: \
+  pe-mcore.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-arm.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pei-arm.c \
   peicode.h
-pe-i386.lo: \
-  pe-i386.c \
+pe-mips.lo: \
+  pe-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-i386.lo: \
-  pei-i386.c \
+pe-ppc.lo: \
+  pe-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-i386.c \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-mcore.lo: \
-  pe-mcore.c \
+pe-sh.lo: \
+  pe-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mcore.lo: \
-  pei-mcore.c \
+pef.lo: \
+  pef.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/safe-ctype.h \
+  pef-traceback.h \
+  pef.h
+pei-arm-wince.lo: \
+  pei-arm-wince.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-mcore.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
+  pei-arm.c \
   peicode.h
-pe-ppc.lo: \
-  pe-ppc.c \
+pei-arm.lo: \
+  pei-arm.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-arm.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-ppc.lo: \
-  pei-ppc.c \
+pei-i386.lo: \
+  pei-i386.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ppc.c \
+  coff-i386.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pe-sh.lo: \
-  pe-sh.c \
+pei-mcore.lo: \
+  pei-mcore.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mcore.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
+  coff-mcore.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-sh.lo: \
-  pei-sh.c \
+pei-mips.lo: \
+  pei-mips.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  peicode.h
-pe-mips.lo: \
   pe-mips.c \
+  peicode.h
+pei-ppc.lo: \
+  pei-ppc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/powerpc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  coff-ppc.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
   peicode.h
-pei-mips.lo: \
-  pei-mips.c \
+pei-sh.lo: \
+  pei-sh.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mipspe.h \
   $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coff-sh.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
-  pe-mips.c \
   peicode.h
 plugin.lo: \
   plugin.c \
-  $(INCDIR)/plugin-api.h \
   $(INCDIR)/filenames.h \
-  plugin.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h
+  $(INCDIR)/libiberty.h \
+  $(INCDIR)/plugin-api.h \
+  plugin.h
 ppcboot.lo: \
   ppcboot.c \
   $(INCDIR)/filenames.h \
@@ -3445,6 +3442,10 @@ riscix.lo: \
   $(INCDIR)/hashtab.h \
   aout-target.h \
   libaout.h
+som.lo: \
+  som.c \
+  $(INCDIR)/alloca-conf.h \
+  $(INCDIR)/filenames.h
 sparclinux.lo: \
   sparclinux.c \
   $(INCDIR)/aout/aout64.h \
@@ -3493,8 +3494,8 @@ sunos.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-vaxnetbsd.lo: \
-  vaxnetbsd.c \
+vax1knetbsd.lo: \
+  vax1knetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3505,8 +3506,8 @@ vaxnetbsd.lo: \
   aout-target.h \
   libaout.h \
   netbsd.h
-vax1knetbsd.lo: \
-  vax1knetbsd.c \
+vaxbsd.lo: \
+  vaxbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3515,10 +3516,9 @@ vax1knetbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h \
-  netbsd.h
-vaxbsd.lo: \
-  vaxbsd.c \
+  libaout.h
+vaxnetbsd.lo: \
+  vaxnetbsd.c \
   $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/ar.h \
   $(INCDIR)/aout/stab.def \
@@ -3527,18 +3527,13 @@ vaxbsd.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   aout-target.h \
-  libaout.h
+  libaout.h \
+  netbsd.h
 versados.lo: \
   versados.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h
-vms.lo: \
-  vms.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  vms.h
 vms-gsd.lo: \
   vms-gsd.c \
   $(INCDIR)/bfdlink.h \
@@ -3565,6 +3560,12 @@ vms-tir.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   vms.h
+vms.lo: \
+  vms.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  vms.h
 vmsutil.lo: \
   vmsutil.c \
   vmsutil.h
@@ -3624,6 +3625,19 @@ coff-alpha.lo: \
   ecoffswap.h \
   libcoff.h \
   libecoff.h
+coff-x86_64.lo: \
+  coff-x86_64.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h \
+  coffcode.h \
+  coffswap.h \
+  libcoff.h
 coff64-rs6000.lo: \
   coff64-rs6000.c \
   $(INCDIR)/bfdlink.h \
@@ -3649,33 +3663,33 @@ demo64.lo: \
   aout-target.h \
   aoutf1.h \
   libaout.h
-pei-ia64.lo: \
-  pei-ia64.c \
+elf32-score.lo: \
+  elf32-score.c \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/ia64.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/pe.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  coff-ia64.c \
-  coffcode.h \
-  libcoff.h \
-  libpei.h \
-  peicode.h
-elf64-x86-64.lo: \
-  elf64-x86-64.c \
+  $(INCDIR)/libiberty.h \
+  elf-bfd.h \
+  elf32-score.h \
+  elf32-target.h
+elf32-score7.lo: \
+  elf32-score7.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/x86-64.h \
+  $(INCDIR)/elf/score.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  bfd_stdint.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h
+  elf32-score.h
 elf64-alpha.lo: \
   elf64-alpha.c \
   $(INCDIR)/aout/ar.h \
@@ -3697,22 +3711,6 @@ elf64-alpha.lo: \
   elf64-target.h \
   libcoff.h \
   libecoff.h
-elf64-hppa.lo: \
-  elf64-hppa.c \
-  $(INCDIR)/alloca-conf.h \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/hppa.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf-hppa.h \
-  elf64-hppa.h \
-  elf64-target.h \
-  libhppa.h
 elf64-gen.lo: \
   elf64-gen.c \
   $(INCDIR)/bfdlink.h \
@@ -3723,27 +3721,22 @@ elf64-gen.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elfn32-mips.lo: \
-  elfn32-mips.c \
+elf64-hppa.lo: \
+  elf64-hppa.c \
+  $(INCDIR)/alloca-conf.h \
   $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/mips.h \
-  $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/hppa.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mips.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  ecoffswap.h \
   elf-bfd.h \
-  elf32-target.h \
-  elfxx-mips.h \
-  genlink.h
+  elf-hppa.h \
+  elf64-hppa.h \
+  elf64-target.h \
+  libhppa.h
 elf64-mips.lo: \
   elf64-mips.c \
   $(INCDIR)/aout/ar.h \
@@ -3803,71 +3796,78 @@ elf64-s390.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf64-target.h
-elf32-score.lo: \
-  elf32-score.c \
+elf64-sh64.lo: \
+  elf64-sh64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sh.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf32-score.h \
-  elf32-target.h
-elf32-score7.lo: \
-  elf32-score7.c \
+  elf64-target.h
+elf64-sparc.lo: \
+  elf64-sparc.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/score.h \
+  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  $(INCDIR)/opcode/sparc.h \
   elf-bfd.h \
-  elf32-score.h
-elf64-sh64.lo: \
-  elf64-sh64.c \
+  elf64-target.h \
+  elfxx-sparc.h
+elf64-x86-64.lo: \
+  elf64-x86-64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sh.h \
+  $(INCDIR)/elf/x86-64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
+  bfd_stdint.h \
   elf-bfd.h \
   elf64-target.h
-elf64-sparc.lo: \
-  elf64-sparc.c \
+elf64.lo: \
+  elf64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/elf/sparc.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/opcode/sparc.h \
+  $(INCDIR)/libiberty.h \
   elf-bfd.h \
-  elf64-target.h \
-  elfxx-sparc.h
-elf64.lo: \
-  elf64.c \
+  elfcode.h \
+  elfcore.h
+elfn32-mips.lo: \
+  elfn32-mips.c \
   $(INCDIR)/bfdlink.h \
+  $(INCDIR)/coff/ecoff.h \
+  $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/mips.h \
+  $(INCDIR)/coff/sym.h \
+  $(INCDIR)/coff/symconst.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mips.h \
+  $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
+  ecoffswap.h \
   elf-bfd.h \
-  elfcode.h \
-  elfcore.h
+  elf32-target.h \
+  elfxx-mips.h \
+  genlink.h
 mmo.lo: \
   mmo.c \
   $(INCDIR)/elf/mmix.h \
@@ -3896,8 +3896,8 @@ nlm64.lo: \
   $(INCDIR)/nlm/internal.h \
   libnlm.h \
   nlmcode.h
-coff-x86_64.lo: \
-  coff-x86_64.c \
+pe-x86_64.lo: \
+  pe-x86_64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h \
@@ -3906,20 +3906,21 @@ coff-x86_64.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h \
+  coff-x86_64.c \
   coffcode.h \
-  coffswap.h \
-  libcoff.h
-pe-x86_64.lo: \
-  pe-x86_64.c \
+  libcoff.h \
+  libpei.h \
+  peicode.h
+pei-ia64.lo: \
+  pei-ia64.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/ia64.h \
   $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/pe.h \
-  $(INCDIR)/coff/x86_64.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h \
-  coff-x86_64.c \
+  coff-ia64.c \
   coffcode.h \
   libcoff.h \
   libpei.h \
@@ -3948,6 +3949,10 @@ aix386-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libcoff.h
+cisco-core.lo: \
+  cisco-core.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 hpux-core.lo: \
   hpux-core.c \
   $(INCDIR)/filenames.h \
@@ -3976,10 +3981,6 @@ trad-core.lo: \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
   libaout.h
-cisco-core.lo: \
-  cisco-core.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 elf32-ia64.lo: \
   elf32-ia64.c \
   $(INCDIR)/bfdlink.h \
Index: binutils/dep-in.sed
===================================================================
RCS file: /cvs/src/src/binutils/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- binutils/dep-in.sed	26 May 2009 03:19:38 -0000	1.5
+++ binutils/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile.am
--- binutils/Makefile.am	26 May 2009 03:19:38 -0000	1.108
+++ binutils/Makefile.am	4 Jun 2009 05:45:21 -0000
@@ -411,7 +411,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
 	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 '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
@@ -496,6 +497,7 @@ addr2line.o: \
 ar.o: \
   ar.c \
   $(BFDDIR)/libbfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ar.h \
@@ -764,6 +766,7 @@ nlmconv.o: \
 nm.o: \
   nm.c \
   $(BFDDIR)/elf-bfd.h \
+  $(BFDDIR)/plugin.h \
   $(INCDIR)/alloca-conf.h \
   $(INCDIR)/ansidecl.h \
   $(INCDIR)/aout/ranlib.h \
Index: gas/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gas/dep-in.sed,v
retrieving revision 1.12
diff -u -p -r1.12 dep-in.sed
--- gas/dep-in.sed	26 May 2009 03:19:49 -0000	1.12
+++ gas/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -47,5 +47,6 @@ s! write\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.170
diff -u -p -r1.170 Makefile.am
--- gas/Makefile.am	26 May 2009 03:19:49 -0000	1.170
+++ gas/Makefile.am	4 Jun 2009 05:45:21 -0000
@@ -922,7 +922,8 @@ DEP1: $(CFILES) $(MULTI_CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(DEP_FLAGS) $$f > DEP; \
 	  sed -n -e '1s/: .*/: \\/p' -e q < DEP >> DEP2; \
-	  sed -e '1s/.*://' -f ../dep.sed < DEP | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*://' -f ../dep.sed < DEP | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	mv -f DEPDIR/DEP2 $@
@@ -952,7 +953,7 @@ DEPTC: $(TARGET_CPU_CFILES)
 	      echo "DEPTC_$${c}_$${o} = \\" >> ../DEPTCA; \
 	      $(MKDEP) $(DEP_FLAGS) dumtc.c | \
 		sed -e '1s/dumtc.o: //' -f ../dep.sed | \
-		LC_ALL=C sort | uniq | \
+		LC_ALL=C sort | LC_ALL=C uniq | \
 		sed -e '/^A/d' -e 's/^B/  /' -e '$$s/ \\$$//' >> ../DEPTCA; \
 	      rm -f dumtc.c; \
 	    else true; fi; \
@@ -993,7 +994,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES)
 	      echo "DEPOBJ_$${c}_$${o} = \\" >> ../DEPOBJA; \
 	      $(MKDEP) $(DEP_FLAGS) dumobj.c | \
 	        sed -e "s/dumobj.o: //" -f ../dep.sed | \
-		LC_ALL=C sort | uniq | \
+		LC_ALL=C sort | LC_ALL=C uniq | \
 		sed -e '/^A/d' -e 's/^B/  /' -e '$$s/ \\$$//' >> ../DEPOBJA; \
 	      rm -f dumobj.c; \
 	    else true; fi; \
@@ -1031,7 +1032,7 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_
 	      echo "DEP_$${c}_$${o} = \\" >> ../DEP2A; \
 	      $(MKDEP) $(DEP_FLAGS) dummy.c | \
 	        sed -e "s/dummy.o: //" -f ../dep.sed | \
-		LC_ALL=C sort | uniq | \
+		LC_ALL=C sort | LC_ALL=C uniq | \
 		sed -e '/^A/d' -e 's/^B/  /' -e '$$s/ \\$$//' >> ../DEP2A; \
 	    else true; fi; \
 	  done; \
Index: gprof/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gprof/dep-in.sed,v
retrieving revision 1.4
diff -u -p -r1.4 dep-in.sed
--- gprof/dep-in.sed	26 May 2009 03:20:00 -0000	1.4
+++ gprof/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile.am
--- gprof/Makefile.am	26 May 2009 03:20:00 -0000	1.47
+++ gprof/Makefile.am	4 Jun 2009 05:45:22 -0000
@@ -194,7 +194,8 @@ DEP1: $(gprof_SOURCES)
 	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 '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
Index: ld/dep-in.sed
===================================================================
RCS file: /cvs/src/src/ld/dep-in.sed,v
retrieving revision 1.6
diff -u -p -r1.6 dep-in.sed
--- ld/dep-in.sed	26 May 2009 03:20:10 -0000	1.6
+++ ld/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.265
diff -u -p -r1.265 Makefile.am
--- ld/Makefile.am	26 May 2009 03:20:10 -0000	1.265
+++ ld/Makefile.am	4 Jun 2009 05:45:23 -0000
@@ -2022,7 +2022,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
 	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 '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA
Index: opcodes/dep-in.sed
===================================================================
RCS file: /cvs/src/src/opcodes/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- opcodes/dep-in.sed	26 May 2009 03:19:28 -0000	1.5
+++ opcodes/dep-in.sed	4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.138
diff -u -p -r1.138 Makefile.am
--- opcodes/Makefile.am	26 May 2009 03:19:28 -0000	1.138
+++ opcodes/Makefile.am	4 Jun 2009 05:45:23 -0000
@@ -654,7 +654,8 @@ DEP1: $(CFILES)
 	for f in $?; do \
 	  $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
 	  sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
-	  sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+	  sed -e '1s/.*: //' -f dep.sed < DEPA | \
+	    LC_ALL=C sort | LC_ALL=C uniq | \
 	    sed -e 's/^[AB]/  /' -e '$$s/ \\$$//' >> DEP2; \
 	done
 	rm -f DEPA

-- 
Alan Modra
Australia Development Lab, IBM
References:
- Re: makefile dependency revamp
  - From: Ralf Wildenhues
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]