* Makefile.in (bfd.h): Move closer to headers - and after 'all'!

2 files changed, 72 insertions, 61 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2338b9e..c2d8998 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,7 @@
 Tue Jun  1 14:40:41 1993  Per Bothner  (bothner@rtl.cygnus.com)
 
+	* Makefile.in (bfd.h):  Move closer to headers - and after 'all'!
+
 	* aoutx.h (translate_from_native_sym_flags):  Don't set
 	BSF_DEBUGGING for constructor symbols, only BSF_CONSTRUCTOR.
 	* aoutx.h (translate_to_native_sym_flags):  Translate
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 9849d2c..db3fe6a 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -64,10 +64,6 @@ DEP = mkdep
 SUBDIRS = doc
 
 
-# Change this (to MINIMIZE=1) to save space in executables.
-# Currently, all this does is control the target_vector in targets.c.
-MINIMIZE=0
-
 TARGETLIB = libbfd.a
 
 
@@ -79,9 +75,8 @@ BFD_MACHINES = cpu-h8300.o cpu-i960.o cpu-sparc.o cpu-m68k.o cpu-m88k.o \
 	cpu-vax.o cpu-mips.o cpu-a29k.o cpu-i386.o cpu-rs6000.o cpu-hppa.o \
 	cpu-z8k.o cpu-we32k.o cpu-h8500.o cpu-alpha.o cpu-sh.o
 
-BFD_BACKENDS = aout32.o sunos.o newsos3.o mipsbsd.o aout-adobe.o \
+BFD32_BACKENDS = aout32.o sunos.o newsos3.o mipsbsd.o aout-adobe.o \
 	i386aout.o i386bsd.o i386linux.o i386lynx.o \
-	aout64.o demo64.o \
 	coff-i960.o coff-a29k.o coff-m68k.o coff-i386.o coff-m88k.o \
 	coff-rs6000.o coff-h8300.o coff-h8500.o coff-z8k.o coff-we32k.o \
 	coff-mips.o coff-msym.o \
@@ -91,8 +86,19 @@ BFD_BACKENDS = aout32.o sunos.o newsos3.o mipsbsd.o aout-adobe.o \
 	hppa.o oasys.o ieee.o srec.o stab-syms.o coff-alpha.o coff-sh.o \
 	hp300hpux.o
 
+BFD64_BACKENDS = \
+	aout64.o demo64.o \
+	elf64.o
+
 OPTIONAL_BACKENDS = trad-core.o
 
+# These are defined by configure.in:
+# WORDSIZE=32
+# BFD_BACKENDS = $(BFD32_BACKENDS)
+# Change this (to MINIMIZE=1) to save space in executables.
+# Currently, all this does is control the target_vector in targets.c.
+# MINIMIZE=0
+
 #### host and target dependent Makefile fragments come in here.
 ###
 
@@ -115,8 +121,6 @@ FLAGS_TO_PASS = \
 .c.o:
 	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
 
-BFD_H=$(INCDIR)/bfd.h
-
 # C source files that correspond to .o's.
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c \
 	 archures.c coff-i386.c aout64.c aout32.c sunos.c demo64.c \
@@ -210,10 +214,10 @@ clobber realclean:
 # 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.
 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_MACHINES):  libbfd.h bfd.h $(RECONFIG)
+$(BFD_BACKENDS):  libbfd.h bfd.h $(RECONFIG)
+$(OPTIONAL_BACKENDS):  libbfd.h bfd.h $(RECONFIG)
 
 # Get around a Sun Make bug in SunOS 4.1.1 with VPATH
 cpu-i386.o:cpu-i386.c
@@ -279,14 +283,14 @@ install:
 	# Install BFD include file, and others that it needs.  Install them
 	# both in GCC's include directory, and in the system include dir
 	# if configured as $(oldincludedir) -- which it usually isnt.
-	$(INSTALL_DATA) $(INCDIR)/bfd.h $(includedir)/bfd.h
+	$(INSTALL_DATA) bfd.h $(includedir)/bfd.h
 	$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
 	$(INSTALL_DATA) $(INCDIR)/obstack.h $(includedir)/obstack.h
 	-if [ -z "$(oldincludedir)" ] ; then true ; \
 	 else if [ -d $(oldincludedir) ] ; then true ; \
 	      else mkdir $(oldincludedir) ; \
 	      fi ; \
-	      $(INSTALL_DATA) $(INCDIR)/bfd.h      $(oldincludedir)/bfd.h;\
+	      $(INSTALL_DATA) bfd.h      $(oldincludedir)/bfd.h;\
 	      $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(oldincludedir)/ansidecl.h;\
 	      $(INSTALL_DATA) $(INCDIR)/obstack.h  $(oldincludedir)/obstack.h;\
 	 fi
@@ -308,11 +312,16 @@ aout-params.h: gen-aout
 gen-aout: $(srcdir)/gen-aout.c Makefile
 	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
 
+BFDIN_H= $(srcdir)/bfd-in2.h
+
+bfd.h: $(BFDIN_H) Makefile
+	sed -e 's/@WORDSIZE@/$(WORDSIZE)/' < $(BFDIN_H) > bfd.h
+
 headers:
 	(cd $(docdir); $(MAKE) protos $(FLAGS_TO_PASS))
 	# Could really use a "copy-if-change"...
 	cp $(docdir)/bfd.h bfd.h-new
-	$(srcdir)/../move-if-change bfd.h-new $(BFD_H)
+	$(srcdir)/../move-if-change bfd.h-new $(BFDIN_H)
 	cp $(docdir)/libbfd.h libbfd.h-new
 	$(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
 	cp $(docdir)/libcoff.h libcoff.h-new
@@ -332,116 +341,116 @@ 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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
-opncls.o : opncls.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
-bfd.o : bfd.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
+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/sym.h libecoff.h
-archive.o : archive.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
+archive.o : archive.c bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h 
-targets.o : targets.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
-cache.o : cache.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
-archures.o : archures.c $(INCDIR)/bfd.h $(INCDIR)/obstack.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 $(INCDIR)/bfd.h $(INCDIR)/ansidecl.h \
+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 $(INCDIR)/bfd.h $(INCDIR)/obstack.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 
 demo64.o : demo64.c 
 
-srec.o : srec.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
-oasys.o : oasys.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
+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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
+ieee.o : ieee.c bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/ieee.h libieee.h 
-coff-h8300.o: coff-h8300.c  $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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  $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 
-coff-mips.o: coff-mips.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
+coff-mips.o: coff-mips.c bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/coff/mips.h $(INCDIR)/coff/internal.h libcoff.h coffcode.h \
   coffswap.h seclet.h libecoff.h
-coff-rs6000.o: coff-rs6000.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h libbfd.h $(INCDIR)/coff/internal.h \
+coffgen.o: coffgen.c bfd.h libbfd.h $(INCDIR)/coff/internal.h \
   libcoff.h
-reloc16.o: reloc16.c $(INCDIR)/bfd.h libbfd.h $(INCDIR)/coff/internal.h \
+reloc16.o: reloc16.c bfd.h libbfd.h $(INCDIR)/coff/internal.h \
   libcoff.h seclet.h
-format.o : format.c $(INCDIR)/bfd.h \
+format.o : format.c bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
-section.o : section.c $(INCDIR)/bfd.h \
+section.o : section.c bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
-core.o : core.c $(INCDIR)/bfd.h \
+core.o : core.c bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
-syms.o : syms.c $(INCDIR)/bfd.h \
+syms.o : syms.c bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
 syms.o : stab-syms.c
-reloc.o : reloc.c $(INCDIR)/bfd.h \
+reloc.o : reloc.c bfd.h \
   $(INCDIR)/obstack.h libbfd.h 
 
-trad-core.o : trad-core.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
+trad-core.o : trad-core.c bfd.h $(INCDIR)/obstack.h \
   libbfd.h libaout.h 
 
-coff-msym.o: coff-msym.c $(INCDIR)/bfd.h  $(INCDIR)/coff/ecoff-ext.h \
+coff-msym.o: coff-msym.c bfd.h  $(INCDIR)/coff/ecoff-ext.h \
   $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h
 
-newsos3.o : newsos3.c $(INCDIR)/bfd.h $(INCDIR)/obstack.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 
-i386aout.o : i386aout.c $(INCDIR)/bfd.h $(INCDIR)/obstack.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 
-i386linux.o : i386linux.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.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 $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
+mipsbsd.o : mipsbsd.c bfd.h $(INCDIR)/obstack.h \
   libbfd.h libaout.h
-elf32.o : elf32.c elfcode.h libelf.h libbfd.h $(INCDIR)/bfd.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 $(INCDIR)/bfd.h \
+elf32-sparc.o : elf32-sparc.c libelf.h libbfd.h bfd.h \
   $(INCDIR)/obstack.h
-elf32-m68k.o : elf32-m68k.c libelf.h libbfd.h $(INCDIR)/bfd.h \
+elf32-m68k.o : elf32-m68k.c libelf.h libbfd.h bfd.h \
   $(INCDIR)/obstack.h
-elf32-i860.o : elf32-i860.c libelf.h libbfd.h $(INCDIR)/bfd.h \
+elf32-i860.o : elf32-i860.c libelf.h libbfd.h bfd.h \
   $(INCDIR)/obstack.h
-elf32-i386.o : elf32-i386.c libelf.h libbfd.h $(INCDIR)/bfd.h \
+elf32-i386.o : elf32-i386.c libelf.h libbfd.h bfd.h \
   $(INCDIR)/obstack.h
 elf32-hppa.o : elf32-hppa.c $(srcdir)/elf32-hppa.h libelf.h libbfd.h \
-  $(INCDIR)/bfd.h $(INCDIR)/obstack.h
-elf64.o : elf64.c elfcode.h libelf.h libbfd.h $(INCDIR)/bfd.h \
+  bfd.h $(INCDIR)/obstack.h
+elf64.o : elf64.c elfcode.h libelf.h libbfd.h bfd.h \
   $(INCDIR)/obstack.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY