Make "make dep" easier to work with. Updated lots of dependencies.

Don't try "make dep" alone; use "make dep DEP=mymkdep", where "mymkdep" has
been hacked to use "gcc -MM"...

2 files changed, 147 insertions, 168 deletions

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 5f467d6..e7345a6 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -204,8 +204,9 @@ FLAGS_TO_PASS = \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"BISON=$(BISON)"
 
+ALL_CFLAGS=$(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES)
 .c.o:
-	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
+	$(CC) -c $(ALL_CFLAGS) $<
 
 # C source files that correspond to .o's.
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c \
@@ -320,11 +321,12 @@ clobber realclean:
 # Mark everything as depending on config.status, since the timestamp on
 # sysdep.h might actually move backwards if we reconfig and relink it
 # to a different hosts/h-xxx.h file.  This will force a recompile anyway.
+BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/obstack.h
 RECONFIG = config.status
-$(BFD_LIBS):  libbfd.h $(BFD_H) $(RECONFIG)
-$(BFD_MACHINES):  libbfd.h $(BFD_H) $(RECONFIG)
-$(BFD_BACKENDS):  libbfd.h $(BFD_H) $(RECONFIG)
-$(OPTIONAL_BACKENDS):  libbfd.h $(BFD_H) $(RECONFIG)
+$(BFD_LIBS):  libbfd.h $(BFD_H) $(RECONFIG) $(BFD_H_DEPS)
+$(BFD_MACHINES):  libbfd.h $(BFD_H) $(RECONFIG) $(BFD_H_DEPS)
+$(BFD_BACKENDS):  libbfd.h $(BFD_H) $(RECONFIG) $(BFD_H_DEPS)
+$(OPTIONAL_BACKENDS):  libbfd.h $(BFD_H) $(RECONFIG) $(BFD_H_DEPS)
 
 # Get around a Sun Make bug in SunOS 4.1.1 with VPATH
 cpu-i386.o:cpu-i386.c
@@ -398,8 +400,26 @@ install:
 Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
 	$(SHELL) config.status
 
-dep: $(CFILES)
-	mkdep $(CFLAGS) $?
+# This rule really wants a mkdep that runs "gcc -MM".
+.dep1: $(CFILES)
+	rm -f .dep1 .dep2
+	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
+	$(DEP) -f .dep2 $(ALL_CFLAGS) $?
+	mv -f .dep2 .dep1
+
+dep.sed: dep-in.sed Makefile
+	sed <$(srcdir)/dep-in.sed >dep.sed	\
+		-e 's!@BFD_H@!$(BFD_H)!'	\
+		-e 's!@INCDIR@!$(INCDIR)!'	\
+		-e 's!@srcdir@!$(srcdir)!'
+
+.dep: .dep1 dep.sed
+	sed -f dep.sed <.dep1 >.dep
+
+dep: .dep
+	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
+	cat .dep >> tmp-Makefile
+	mv -f tmp-Makefile Makefile
 
 host-aout.o: Makefile
 
@@ -448,166 +468,104 @@ bfd.ps:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-libbfd.o : libbfd.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h 
-opncls.o : opncls.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h 
-bfd.o : bfd.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h libecoff.h libelf.h
-archive.o : archive.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h 
-targets.o : targets.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h 
-cache.o : cache.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h 
-archures.o : archures.c $(BFD_H) $(INCDIR)/obstack.h 
-aout64.o : aout64.c 
-aout32.o : aout32.c aoutx.h $(BFD_H) $(INCDIR)/ansidecl.h \
-  $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h 
-sunos.o : sunos.c aoutf1.h $(BFD_H) $(INCDIR)/obstack.h \
-  libaout.h libbfd.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h 
-hp300hpux.o : hp300hpux.c aoutx.h $(BFD_H) $(INCDIR)/ansidecl.h \
-  $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/hp300hpux.h aout-target.h
-hp300bsd.o : hp300bsd.c aoutx.h $(BFD_H) $(INCDIR)/ansidecl.h \
-  $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-demo64.o : demo64.c 
-
-srec.o : srec.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h 
-oasys.o : oasys.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/oasys.h liboasys.h 
-ieee.o : ieee.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/ieee.h libieee.h 
-coff-h8300.o: coff-h8300.c  $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-coff-h8500.o: coff-h8500.c  $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-coff-a29k.o: coff-a29k.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h
-coff-i386.o: coff-i386.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-coff-i960.o: coff-i960.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-coff-m68k.o: coff-m68k.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-coff-m88k.o: coff-m88k.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h 
-ecoff.o: ecoff.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/internal.h libecoff.h libcoff.h seclet.h \
-  $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h libaout.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/sym.h \
-  $(INCDIR)/coff/symconst.h
-coff-mips.o: coff-mips.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/mips.h $(INCDIR)/coff/internal.h libcoff.h \
-  coffswap.h seclet.h libecoff.h ecoffswap.h $(INCDIR)/coff/ecoff.h
-coff-alpha.o: coff-alpha.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/alpha.h $(INCDIR)/coff/internal.h libcoff.h \
-  coffswap.h seclet.h libecoff.h ecoffswap.h $(INCDIR)/coff/ecoff.h
-coff-rs6000.o: coff-rs6000.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/rs6000.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h
-coff-z8k.o: coff-z8k.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/z8k.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h
-coff-we32k.o: coff-we32k.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/coff/we32k.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
-  coffswap.h seclet.h
-coffgen.o: coffgen.c $(BFD_H) libbfd.h $(INCDIR)/coff/internal.h \
-  libcoff.h
-reloc16.o: reloc16.c $(BFD_H) libbfd.h $(INCDIR)/coff/internal.h \
-  libcoff.h seclet.h
-format.o : format.c $(BFD_H) \
-  $(INCDIR)/obstack.h libbfd.h 
-section.o : section.c $(BFD_H) \
-  $(INCDIR)/obstack.h libbfd.h 
-core.o : core.c $(BFD_H) \
-  $(INCDIR)/obstack.h libbfd.h 
-syms.o : syms.c $(BFD_H) \
-  $(INCDIR)/obstack.h libbfd.h 
-syms.o : stab-syms.c
-reloc.o : reloc.c $(BFD_H) \
-  $(INCDIR)/obstack.h libbfd.h 
-
-trad-core.o : trad-core.c $(BFD_H) $(INCDIR)/obstack.h \
-  libbfd.h libaout.h 
-sco-core.o : sco-core.c $(BFD_H) libbfd.h libcoff.h \
-  $(INCDIR)/obstack.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h
-aix386-core.o : aix386-core.c $(BFD_H) libbfd.h libcoff.h \
-  $(INCDIR)/obstack.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h
-hpux-core.o : hpux-core.c $(BFD_H) libbfd.h libhppa.h
-osf-core.o : osf-core.c $(BFD_H) libbfd.h
-
-newsos3.o : newsos3.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-i386lynx.o : i386lynx.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-i386lynx-cf.o: i386lynx-cf.c coff-i386.c $(BFD_H) $(INCDIR)/obstack.h \
-  libbfd.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h libcoff.h \
-  coffcode.h coffswap.h seclet.h 
-lynx-core.o : lynx-core.c $(BFD_H) libbfd.h
-i386aout.o : i386aout.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-netbsd386.o : netbsd386.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-i386mach3.o : i386mach3.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-i386linux.o : i386linux.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h
-i386bsd.o : i386bsd.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h libaout.h 
-bout.o : bout.c $(BFD_H) $(INCDIR)/obstack.h libbfd.h \
-  $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h
-mipsbsd.o : mipsbsd.c $(BFD_H) $(INCDIR)/obstack.h \
-  libbfd.h libaout.h
-elf.o : elf.c libelf.h libbfd.h $(BFD_H) $(INCDIR)/obstack.h
-elf32.o : elf32.c elfcode.h libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h
-elf32-sparc.o : elf32-sparc.c libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h elf32-target.h
-elf32-m68k.o : elf32-m68k.c libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h elf32-target.h
-elf32-i860.o : elf32-i860.c libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h elf32-target.h
-elf32-i386.o : elf32-i386.c libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h elf32-target.h
-elf32-hppa.o : elf32-hppa.c $(srcdir)/elf32-hppa.h $(srcdir)/libhppa.h \
-  libelf.h libbfd.h $(BFD_H) $(INCDIR)/obstack.h elf32-target.h
-elf32-m88k.o : elf32-m88k.c libelf.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h elf32-target.h
-elf32-mips.o : elf32-mips.c libelf.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h $(INCDIR)/elf/mips.h elf32-target.h
-elf32-gen.o : elf32-gen.c libelf.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h elf32-target.h
-elf64.o : elf64.c elfcode.h libelf.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h
-elf64-gen.o : elf64-gen.c libelf.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h elf64-target.h
-nlm.o : nlm.c libnlm.h libbfd.h $(BFD_H) $(INCDIR)/obstack.h
-nlm32.o : nlm32.c nlmcode.h libnlm.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h
-nlm32-gen.o : nlm32-gen.c libnlm.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h nlm-target.h
-nlm32-i386.o : nlm32-i386.c libnlm.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h nlm-target.h
-nlm64.o : nlm64.c nlmcode.h libnlm.h libbfd.h $(BFD_H) \
-  $(INCDIR)/obstack.h
-nlm64-gen.o : nlm64-gen.c libnlm.h libbfd.h \
-  $(BFD_H) $(INCDIR)/obstack.h nlm-target.h
+libbfd.o : libbfd.c
+opncls.o : opncls.c
+bfd.o : bfd.c
+archive.o : archive.c
+targets.o : targets.c
+cache.o : cache.c
+archures.o : archures.c
+coff-i386.o : coff-i386.c
+aout64.o : aout64.c aoutx.h \
+ libaout.h \
+ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
+ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
+aout32.o : aout32.c aoutx.h \
+ libaout.h \
+ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
+ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
+sunos.o : sunos.c aoutf1.h
+demo64.o : demo64.c aoutf1.h
+coff-i960.o : coff-i960.c
+srec.o : srec.c
+tekhex.o : tekhex.c
+oasys.o : oasys.c
+ieee.o : ieee.c
+ecoff.o : ecoff.c
+coff-m68k.o : coff-m68k.c
+coff-u68k.o : coff-u68k.c coff-m68k.c
+coff-a29k.o : coff-a29k.c
+coff-rs6000.o : coff-rs6000.c
+coffgen.o : coffgen.c
+format.o : format.c
+section.o : section.c
+core.o : core.c
+syms.o : syms.c \
+ $(INCDIR)/aout/stab.def
+stab-syms.o : stab-syms.c \
+ libaout.h $(INCDIR)/aout/aout64.h \
+ $(INCDIR)/aout/stab.def
+reloc.o : reloc.c
+init.o : init.c
+ctor.o : ctor.c
+seclet.o : seclet.c
+coff-m88k.o : coff-m88k.c
+coff-mips.o : coff-mips.c
+coff-sh.o : coff-sh.c
+trad-core.o : trad-core.c
+newsos3.o : newsos3.c
+i386aout.o : i386aout.c
+i386linux.o : i386linux.c
+netbsd386.o : netbsd386.c
+i386mach3.o : i386mach3.c
+bout.o : bout.c
+aout-adobe.o : aout-adobe.c
+coff-we32k.o : coff-we32k.c
+i386bsd.o : i386bsd.c
+cpu-h8300.o : cpu-h8300.c
+cpu-i960.o : cpu-i960.c
+cpu-sparc.o : cpu-sparc.c
+cpu-m68k.o : cpu-m68k.c
+cpu-m88k.o : cpu-m88k.c
+cpu-vax.o : cpu-vax.c
+cpu-mips.o : cpu-mips.c
+cpu-a29k.o : cpu-a29k.c
+cpu-i386.o : cpu-i386.c
+cpu-rs6000.o : cpu-rs6000.c
+coff-h8300.o : coff-h8300.c
+som.o : som.c
+cpu-hppa.o : cpu-hppa.c
+cpu-we32k.o : cpu-we32k.c
+reloc16.o : reloc16.c
+mipsbsd.o : mipsbsd.c
+cpu-sh.o : cpu-sh.c
+elf32.o : elf32.c elfcode.h
+elf32-sparc.o : elf32-sparc.c
+elf32-i386.o : elf32-i386.c
+elf32-i860.o : elf32-i860.c
+elf32-m68k.o : elf32-m68k.c
+elf32-hppa.o : elf32-hppa.c
+elf32-m88k.o : elf32-m88k.c
+elf32-mips.o : elf32-mips.c
+elf32-gen.o : elf32-gen.c
+elf64.o : elf64.c elfcode.h
+elf64-gen.o : elf64-gen.c
+nlm32.o : nlm32.c nlmcode.h
+nlm32-gen.o : nlm32-gen.c
+nlm32-i386.o : nlm32-i386.c
+nlm64.o : nlm64.c nlmcode.h
+nlm64-gen.o : nlm64-gen.c
+coff-alpha.o : coff-alpha.c
+cpu-alpha.o : cpu-alpha.c
+hp300bsd.o : hp300bsd.c
+hp300hpux.o : hp300hpux.c $(INCDIR)/aout/hp300hpux.h \
+ aoutx.h \
+ libaout.h $(INCDIR)/aout/aout64.h \
+ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
+ $(INCDIR)/aout/ar.h aout-target.h
+i386lynx.o : i386lynx.c
+i386lynx-cf.o : i386lynx-cf.c coff-i386.c
+m68klynx.o : m68klynx.c
+m68klynx-cf.o : m68klynx-cf.c coff-m68k.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-
diff --git a/bfd/dep-in.sed b/bfd/dep-in.sed
new file mode 100644
index 0000000..f2dc0b6
--- /dev/null
+++ b/bfd/dep-in.sed
@@ -0,0 +1,21 @@
+:loop
+/\\$/N
+/\\$/b loop
+
+s! @BFD_H@!!g
+s!@INCDIR@!$(INCDIR)!g
+s!@srcdir@/!!g
+s!hosts/.*\.h ! !g
+s/ sysdep.h//g
+s/ libbfd.h//g
+s! \$(INCDIR)/fopen-.*\.h!!g
+s! \$(INCDIR)/ansidecl\.h!!g
+s! \$(INCDIR)/obstack\.h!!g
+
+s/\\\n *\\/\\/g
+s/\\\n *$/ /g
+
+/^ *\\$/d
+s/ *$//
+s/  */ /g
+/:$/d