* configure.in: Undo some brain damage in the host section.

	* Makefile.in (make):  Remove obsolete `make make'.
	* aoutx.h (some_aout_object_p):  Make defines line up.

1 files changed, 59 insertions, 37 deletions

diff --git a/bfd/configure.in b/bfd/configure.in
index 950a4bc..5180e09 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -11,43 +11,65 @@ target_dependent=true
 # per-host:
 
 case "${host}" in
-  a29k-nyu-sym1)          my_host=ultra3 ;;
-  hppa*-hp-bsd)           my_host=hppabsd ;;
-  hppa*-hp-hpux)          my_host=hppahpux ;;
-  i860-stratus-sysv4)     my_host=stratus ;;
-  i[34]86-*-go32)         my_host=go32 ;;
-  i[34]86-*-linux)        my_host=i386linux ;;
-  i[34]86-*-mach)         my_host=i386mach ;;
-  i[34]86-*-msdos*)       my_host=dose ;;
-  i[34]86-*-sysv*)        my_host=i386v ;;
-  i[34]86-*-sco)          my_host=i386v ;;
-  i[34]86-*-sysv4*)       my_host=i386v4 ;;
-  i[34]86-ncr-sysv4*)     my_host=ncr3000 ;;
-  m68k-apollo-bsd*)       my_host=apollo68 ;;
-  m68k-apollo-sysv*)      my_host=apollov68 ;;
-  m68k-cbm-amigados)      my_host=amigados ;;
-  m68k-cbm-sysv4*)        my_host=amix ;;
-  m68k-hp-bsd)            my_host=hp300bsd ;;
-  m68k-hp-hpux)           my_host=hp300 ;;        # renamed from hp9000
-  m68k-sony-*)            my_host=news ;;
-  m68k-sun-sunos*)        my_host=sun3 ;;
-  m88k-dg-dgux)           my_host=dgux ;;
-  m88k-harris-*)          my_host=harris ;;
-  m88k-motorola-*)        my_host=delta88 ;;
-  mips-dec-ultrix)        my_host=decstation ;;
-  mips-sgi-irix | mips-sgi-irix3) my_host=irix3 ;;
-  mips-sgi-irix4)         my_host=irix4 ;;
-  romp-ibm-bsd*)          my_host=rtbsd ;;
-  rs6000-ibm-aix)         my_host=rs6000 ;;
-  sparc-*-sysv4)          my_host=sysv4 ;;
-  sparc-*-sysv64)         my_host=sysv4-ll ;;
-  sparc-sun-solaris2)     my_host=solaris2 ;;
-  sparc-sun-sunos*)       my_host=sparc ;;
-  sparc-sun-sunos64)      my_host=sparc-ll ;;
-  tahoe-*-*)              my_host=tahoe ;;
-  vax-dec-bsd*)           my_host=vaxbsd ;;
-  vax-dec-ultrix*)        my_host=vaxult ;;
-  we32k-*-*)              my_host=we32k ;;
+# WHEN ADDING ENTRIES TO THIS MATRIX:
+#  Make sure that the left side always has two dashes.  Otherwise you
+#  can get spurious matches.  Even for unambiguous cases, do this as a
+#  convention, else the table becomes a real mess to understand and maintain.
+#
+# Note that these entries cannot be fully alphabetical.  Don't try.
+# The order of matching is critical when multiple lines could match.
+
+a29k-*-*)		my_host=ultra3 ;;
+
+hppa*-hp-hpux)		my_host=hppahpux ;;
+hppa*-hp-bsd)		my_host=hppabsd ;;
+
+i[34]86-ncr*-sysv4*)	my_host=ncr3000 ;;
+i[34]86-*-go32)		my_host=go32 ;;
+i[34]86-*-sysv4*)	my_host=i386v4 ;;
+i[34]86-*-sysv*)	my_host=i386v ;;
+i[34]86-*-solaris*)	my_host=i386v ;;
+i[34]86-*-sco*)		my_host=i386v ;;
+i[34]86-*-mach*)	my_host=i386mach ;;
+i[34]86-*-msdos*)	my_host=dose ;;
+i[34]86-*-linux)	my_host=i386linux ;;
+
+i860-*-*)		my_host=stratus ;;
+
+mips-dec-*)		my_host=decstation ;;
+mips-sgi-irix3)		my_host=irix3 ;;
+mips-sgi-irix4)		my_host=irix4 ;;
+
+m68*-cbm-amigados)	my_host=amigados ;;
+m68*-cbm-sysv4*)	my_host=amix ;;
+m68*-hp-hpux)		my_host=hp300 ;;
+m68*-hp-bsd)		my_host=hp300bsd ;;
+m68*-sony-*)		my_host=news ;;
+m68*-sun-*)		my_host=sun3 ;;
+m68*-apollo*-sysv*)	my_host=apollov68 ;;
+m68*-apollo*-bsd*)	my_host=apollo68 ;;
+
+m88k-motorola-*)	my_host=delta88 ;;
+m88k-harris-*)		my_host=harris ;;
+m88k-*-dgux)		my_host=dgux ;;
+
+romp-*-*)		my_host=rtbsd ;;
+
+rs6000-*-*)		my_host=rs6000 ;;
+
+sparc-*-sunos64)	my_host=sparc-ll ;;
+sparc-*-sysv4*)		my_host=sysv4 ;;
+sparc-*-solaris2*)	my_host=solaris2 ;;
+sparc-*-sysv64)		my_host=sysv4-ll ;;
+sparc-*-*)		my_host=sparc ;;
+
+tahoe-*-*)		my_host=tahoe ;;
+
+vax-*-ultrix*)		my_host=vaxult ;;
+vax-*-*)		my_host=vaxbsd ;;
+
+we32k-*-*)		my_host=we32k ;;
+
 esac
 
 # Set up to make a link between the host's include file and "sysdep.h".