* Makefile.in (.cc.o): Restore .SUFFIXES entry for .cc

[binutils.git] / ld / configure

diff --git a/ld/configure b/ld/configure
index 4386ff660f92559b1825998c4dcdaf91880b8056..8bb4b59b018f7cc63481ef9149b5bacb27fb4f9f 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -1,31 +1,23 @@
-#!/bin/sh
-# Please do not edit this file.  It is generated automatically from
-# configure.in and a configure template.
-configdirs=
-
-# the debugger.
-#set -x
-

 #!/bin/sh
 
 #!/bin/sh
 

-# Configuration script template
+# Configuration script

 #   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
 
 #This file is part of GNU.
 
 #   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
 
 #This file is part of GNU.
 

-#GNU CC is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 1, or (at your option)
-#any later version.
-
-#GNU CC is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */

 
 # $Id$
 
 
 # $Id$
 


@@ -50,19 +42,23 @@ symbolic_link='ln -s'
 progname=$0
 
 # clear some things potentially inherited from environment.
 progname=$0
 
 # clear some things potentially inherited from environment.

-

 ansi=
 ansi=

-clib=
+arguments=$*

 defaulttargets=
 destdir=
 fatal=
 hostsubdir=
 defaulttargets=
 destdir=
 fatal=
 hostsubdir=

-norecurse=
+Makefile=Makefile
+Makefile_in=Makefile.in
+norecursion=
+recurring=

 removing=
 srcdir=
 srctrigger=
 target=
 targets=
 removing=
 srcdir=
 srctrigger=
 target=
 targets=

+commontargets=
+configdirs=

 targetsubdir=
 template=
 verbose=
 targetsubdir=
 template=
 verbose=


@@ -70,35 +66,32 @@ verbose=
 for arg in $*;
 do
        case ${arg} in
 for arg in $*;
 do
        case ${arg} in

-       -ansi | +ansi)
+       -ansi | +a*)

                ansi=true
                ansi=true

-               ;;
-       -clib | +c*)

                clib=clib
                ;;
        -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
                destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
                ;;
                clib=clib
                ;;
        -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
                destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
                ;;

-       -forcesubdirs | +forcesubdirs | +forcesubdir | +forcesubdi | +forcesubd \
-       | +forcesub | +forcesu | +forces | +force | +forc | +for | +fo | +f)
-               forcesubdirs=${arg}
-               ;;

        -languages=* | +languages=* | +language=* | +languag=* \
                | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
                | +l=*)
                languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
                ;;
        -languages=* | +languages=* | +language=* | +languag=* \
                | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
                | +l=*)
                languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
                ;;

-       -gas | +gas | +ga | +g)
+       -gas | +g*)

                gas=yes
                ;;
                gas=yes
                ;;

-       -help | +h | +help)
+       -help | +h*)

                fatal=true
                ;;
                fatal=true
                ;;

-       -nfp | +nfp | +nf | +n)
+       -nfp | +nf*)

                nfp=yes
                ;;
                nfp=yes
                ;;

-       -norecurse | +norecurse)
-               norecurse=true
+       -norecursion | +no*)
+               norecursion=true
+               ;;
+       -recurring | +recurring | +recurrin | +recurri | +recurr | +recur | +recu | +rec | +re)
+               recurring=true

                ;;
        -rm | +rm)
                removing=${arg}
                ;;
        -rm | +rm)
                removing=${arg}


@@ -106,18 +99,21 @@ do
 #      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
 #              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
 #              ;;
 #      -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
 #              srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
 #              ;;

-       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
+       -subdirs | +f* | +su*)
+               subdirs=${arg}
+               ;;
+       -target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=*)

                if [ -n "${targets}" ] ; then
                if [ -n "${targets}" ] ; then

-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"

                fi
 
                newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
                targets="${newtargets}"
                ;;
                fi
 
                newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
                targets="${newtargets}"
                ;;

-       -template=* | +template=*)
+       -template=* | +template=* | +templat=* | +templa=* | +templ=* | +temp=* | +tem=* | +te=*)

                template=`echo ${arg} | sed 's/[+-]template=//'`
                ;;
                template=`echo ${arg} | sed 's/[+-]template=//'`
                ;;

-       +verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
+       -v | -verbose | +v*)

                verbose=${arg}
                ;;
        -* | +*)
                verbose=${arg}
                ;;
        -* | +*)


@@ -128,7 +124,7 @@ do
                ;;
        *)
                if [ -n "${hosts}" ] ; then
                ;;
        *)
                if [ -n "${hosts}" ] ; then

-                       forcesubdirs="+forcesubdirs"
+                       subdirs="+subdirs"

                fi
 
                newhosts="${hosts} ${arg}"
                fi
 
                newhosts="${hosts} ${arg}"


@@ -139,7 +135,6 @@ done
 
 if [ -n "${verbose}" ] ; then
        echo `pwd`/configure $*
 
 if [ -n "${verbose}" ] ; then
        echo `pwd`/configure $*

-       echo targets=\"${targets}\"

 fi
 
 # process host and target only if not rebuilding configure itself or removing.
 fi
 
 # process host and target only if not rebuilding configure itself or removing.


@@ -148,7 +143,7 @@ if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
        if [ -z "${hosts}" ] ; then
                (echo ;
                echo "configure: No HOST specified." ;
        if [ -z "${hosts}" ] ; then
                (echo ;
                echo "configure: No HOST specified." ;

-               echo) 2>&1
+               echo) 1>&2

                fatal=true
        fi
 fi
                fatal=true
        fi
 fi


@@ -159,18 +154,18 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        echo "Options: [defaults in brackets]" ;
        echo " +ansi            configure w/ANSI library. [no ansi lib]" ;
        echo " +destdir=MYDIR   configure for installation into MYDIR. [/usr/local]" ;
        echo "Options: [defaults in brackets]" ;
        echo " +ansi            configure w/ANSI library. [no ansi lib]" ;
        echo " +destdir=MYDIR   configure for installation into MYDIR. [/usr/local]" ;

-       echo " +forcesubdirs    configure in subdirectories.  [in source directories]" ;
+       echo " +subdirs         configure in subdirectories.  [in source directories]" ;

        echo " +lang=LANG       configure to build LANG. [gcc]" ;
        echo " +help            print this message. [normal config]" ;
        echo " +gas             configure the compilers for use with gas. [native as]" ;
        echo " +nfp             configure the compilers default to soft floating point. [hard float]" ;
        echo " +lang=LANG       configure to build LANG. [gcc]" ;
        echo " +help            print this message. [normal config]" ;
        echo " +gas             configure the compilers for use with gas. [native as]" ;
        echo " +nfp             configure the compilers default to soft floating point. [hard float]" ;

-       echo " +norecurse       configure this directory only. [recurse]" ;
+       echo " +norecursion     configure this directory only. [recurse]" ;

        echo " +rm              remove this configuration. [build a configuration]" ;
        echo " +target=TARGET   configure for TARGET.  [TARGET = HOST]" ;
        echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
        echo ;
        echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
        echo " +rm              remove this configuration. [build a configuration]" ;
        echo " +target=TARGET   configure for TARGET.  [TARGET = HOST]" ;
        echo " +template=TEM    rebuild configure using TEM. [normal config]" ;
        echo ;
        echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;

-       echo "Asking for more than one \"+target\" implies \"+forcesubdirs\".  Any other" ;
+       echo "Asking for more than one \"+target\" implies \"+subdirs\".  Any other" ;

        echo "options given will apply to all targets.") 1>&2
 
        if [ -r config.status ] ; then
        echo "options given will apply to all targets.") 1>&2
 
        if [ -r config.status ] ; then


@@ -186,8 +181,7 @@ fi
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 

-configdirs=
-srctrigger=ldver.c
+srctrigger=ldmain.c

 srcname="linker"
 
 ## end of common part.
 srcname="linker"
 
 ## end of common part.


@@ -195,7 +189,7 @@ srcname="linker"
 # are we rebuilding config itself?
 if [ -n "${template}" ] ; then
        if [ ! -r ${template} ] ; then
 # are we rebuilding config itself?
 if [ -n "${template}" ] ; then
        if [ ! -r ${template} ] ; then

-               echo "Can't find template ${template}."
+               echo '***' "Can't find template ${template}." 1>&2

                exit 1
        fi
 
                exit 1
        fi
 


@@ -209,31 +203,42 @@ if [ -n "${template}" ] ; then
        -e '/^#### configure.in per-target parts come in here.$/,/^## end of per-target part.$/c\
 #### configure.in per-target parts come in here.\
 ## end of per-target part.' \
        -e '/^#### configure.in per-target parts come in here.$/,/^## end of per-target part.$/c\
 #### configure.in per-target parts come in here.\
 ## end of per-target part.' \

+       -e '/^#### configure.in post-target parts come in here.$/,/^## end of post-target part.$/c\
+#### configure.in post-target parts come in here.\
+## end of post-target part.' \

        < ${template} > template.new
 
        if [ -r configure.in ] ; then
                if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
        < ${template} > template.new
 
        if [ -r configure.in ] ; then
                if [ -z "`grep '^# per\-host:' configure.in`" ] ; then

-                       echo `pwd`/configure.in has no "per-host:" line.
+                       echo '***' `pwd`/configure.in has no "per-host:" line. 1>&2

                        exit 1
                fi
 
                if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
                        exit 1
                fi
 
                if [ -z "`grep '^# per\-target:' configure.in`" ] ; then

-                       echo `pwd`/configure.in has no "per-target:" line.
+                       echo '***' `pwd`/configure.in has no "per-target:" line. 1>&2

                        exit 1
                fi
 
                        exit 1
                fi
 

-               # split configure.in into common, per-host, and per-target parts
+               # split configure.in into common, per-host, per-target,
+               # and post-target parts.  Post-target is optional.

                sed -e '/^# per\-host:/,$d' configure.in > configure.com
                sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst
                sed -e '/^# per\-host:/,$d' configure.in > configure.com
                sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst

-               sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
+               if grep -s '^# post-target:' configure.in ; then
+                 sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' configure.in > configure.tgt
+                 sed -e '1,/^# post\-target:/d' configure.in > configure.pos
+               else
+                 sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
+                 echo >configure.pos
+               fi

 
                # and insert them
                sed -e '/^#### configure.in common parts come in here.$/  r configure.com' \
                        -e '/^#### configure.in per\-host parts come in here.$/  r configure.hst' \
                        -e '/^#### configure.in per\-target parts come in here.$/  r configure.tgt' \
 
                # and insert them
                sed -e '/^#### configure.in common parts come in here.$/  r configure.com' \
                        -e '/^#### configure.in per\-host parts come in here.$/  r configure.hst' \
                        -e '/^#### configure.in per\-target parts come in here.$/  r configure.tgt' \

+                       -e '/^#### configure.in post\-target parts come in here.$/  r configure.pos' \

                        template.new > configure.new
 
                        template.new > configure.new
 

-               rm -f configure.com configure.tgt configure.hst
+               rm -f configure.com configure.tgt configure.hst configure.pos

        else
                echo Warning: no configure.in in `pwd`
                cat ${template} >> configure
        else
                echo Warning: no configure.in in `pwd`
                cat ${template} >> configure


@@ -243,9 +248,30 @@ if [ -n "${template}" ] ; then
        rm template.new
 #      mv configure configure.old
        mv configure.new configure
        rm template.new
 #      mv configure configure.old
        mv configure.new configure

-       echo Rebuilt configure in `pwd`

 
 

-       if [ -z "${norecurse}" ] ; then
+       if [ -n "${verbose}" ] ; then
+               echo Rebuilt configure in `pwd`
+       fi
+
+       # Now update config.sub from the template directory.
+       if echo "$template" | grep -s 'configure$' ; then
+               cp `echo "$template" | sed s/configure$/config.sub/` ./config.sub.new
+       #       mv config.sub config.sub.old
+               mv config.sub.new config.sub
+
+               if [ -n "${verbose}" ] ; then
+                       echo Rebuilt config.sub in `pwd`
+               fi
+       fi
+
+       if [ -z "${norecursion}" ] ; then
+               # If template is relative path, make it absolute for recurring.
+               if echo "${template}" | grep -s '^/' ; then
+                  true
+               else
+                  template=`pwd`/${template}
+               fi
+

                while [ -n "${configdirs}" ] ; do
                        # set configdir to car of configdirs, configdirs to cdr of configdirs
                        set ${configdirs}; configdir=$1; shift; configdirs=$*
                while [ -n "${configdirs}" ] ; do
                        # set configdir to car of configdirs, configdirs to cdr of configdirs
                        set ${configdirs}; configdir=$1; shift; configdirs=$*


@@ -262,10 +288,12 @@ if [ -n "${template}" ] ; then
                                                (cd $i ;
                                                        ./configure +template=${template} ${verbose})
                                        else
                                                (cd $i ;
                                                        ./configure +template=${template} ${verbose})
                                        else

-                                               echo No configure script in `pwd`/$i
+                                               echo Warning: No configure script in `pwd`/$i

                                        fi
                                else
                                        fi
                                else

-                                       echo Warning: directory $i is missing.
+                                       if [ -n "${verbose}" ] ; then
+                                         echo Warning: directory $i is missing.
+                                       fi

                                fi
                        done
                done
                                fi
                        done
                done


@@ -276,7 +304,7 @@ fi
 
 # some sanity checks on configure.in
 if [ -z "${srctrigger}" ] ; then
 
 # some sanity checks on configure.in
 if [ -z "${srctrigger}" ] ; then

-       echo srctrigger not set in configure.in. `pwd` not configured.
+       echo Warning: srctrigger not set in configure.in. `pwd` not configured.

        exit 1
 fi
 
        exit 1
 fi
 


@@ -287,62 +315,157 @@ for host in ${hosts} ; do
                defaulttargets=true
        fi
 
                defaulttargets=true
        fi
 

+       host_alias=${host}
+
+       result=`/bin/sh ./config.sub ${host}`
+       host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+       host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+       host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+       host=${host_cpu}-${host_vendor}-${host_os}

        host_makefile_frag=config/hmake-${host}
 
 #### configure.in per-host parts come in here.
 
        host_makefile_frag=config/hmake-${host}
 
 #### configure.in per-host parts come in here.
 

-## end of per-host part.
+if [ "${host_os}" = "posix" ] ; then
+       my_host=posix
+else
+       case "${host_cpu}" in
+       rs6000) my_host=aix ;;
+       mips)
+               case "${host_vendor}" in
+               dec)    my_host=dec3100 ;;
+               esac
+               ;;
+       m88k)
+               case "${host_vendor}" in
+               *)
+                       case "${host_os}" in
+                       dgux)   my_host=dgux ;;
+                       esac
+                       ;;
+               esac
+               ;;

 
 

+       m68k)
+               case "${host_vendor}" in
+               hp)     my_host=hp9000 ;;
+               sony)   my_host=news ;;
+               sun)    my_host=sun3 ;;
+               esac
+               ;;

 
 

-       for target in ${targets} ; do
+       i386)
+               case "${host_vendor}" in
+               *)
+                       case "${host_os}" in
+                       sysv)   my_host=i386v ;;
+                       esac
+                       ;;
+               esac
+               ;;

 
 

-               if [ -n "${verbose}" ] ; then
-                       echo host \= \"${host}\", target \= \"${target}\".
-               fi
+       sparc)
+               case "${host_vendor}" in
+               sun)    my_host=sun4 ;;
+               esac
+               ;;

 
 

+       rtpc)   my_host=rtbsd ;;
+       tahoe | vax)    my_host=${host_cpu} ;;
+       esac
+fi
+
+if [ ! -f config/h-${my_host} ] ; then
+       echo '***' The linker do not support host ${host}
+       exit 1
+fi
+
+host_makefile_frag=config/h-${my_host}
+
+## end of per-host part.
+
+       for target in ${targets} ; do
+
+               target_alias=${target}
+               result=`/bin/sh ./config.sub ${target}`
+               target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+               target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+               target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+               target=${target_cpu}-${target_vendor}-${target_os}

                target_makefile_frag=config/tmake-${target}
 
 #### configure.in per-target parts come in here.
 
                target_makefile_frag=config/tmake-${target}
 
 #### configure.in per-target parts come in here.
 

+case ${target_cpu} in
+sparc)
+       case ${target_vendor} in
+       sun) my_target=sun4 ;;
+       esac
+       ;;
+m88k)  my_target=m88k-bcs ;;
+a29k)  my_target=coff-a29k ;;
+m68k)  
+       case ${target_vendor} in
+       sun) my_target=sun3 ;;
+       sony) my_target=news;;
+       *) echo "Unknown 68k target vendor:" ${target_vendor} ;;
+       esac
+esac
+
+target_makefile_frag=config/t-${my_target}
+
+files=
+links=

 ## end of per-target part.
 
                # Temporarily, we support only direct subdir builds.
 ## end of per-target part.
 
                # Temporarily, we support only direct subdir builds.

-               hostsubdir=Host-${host}
-               targetsubdir=Target-${target}
+               hostsubdir=H-${host_alias}
+               targetsubdir=T-${target_alias}

 
                if [ -n "${removing}" ] ; then
 
                if [ -n "${removing}" ] ; then

-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${subdirs}" ] ; then

                                if [ -d "${hostsubdir}" ] ; then
                                        rm -rf ${hostsubdir}/${targetsubdir}
 
                                if [ -d "${hostsubdir}" ] ; then
                                        rm -rf ${hostsubdir}/${targetsubdir}
 

-                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
+                                       if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target- | grep -v Target-independent`" ] ; then

                                                rm -rf ${hostsubdir}
                                        fi
                                else
                                        echo Warning: no `pwd`/${hostsubdir} to remove.
                                fi
                        else
                                                rm -rf ${hostsubdir}
                                        fi
                                else
                                        echo Warning: no `pwd`/${hostsubdir} to remove.
                                fi
                        else

-                               rm -f Makefile config.status ${links}
+                               rm -f ${Makefile} config.status ${links}

                        fi
                else
                        fi
                else

-                       if [ -n "${forcesubdirs}" ] ; then
+                       if [ -n "${subdirs}" ] ; then

                                # check for existing status before allowing forced subdirs.
                                # check for existing status before allowing forced subdirs.

-                               if [ -f Makefile ] ; then
-                                       echo "Makefile already exists in source directory.  `pwd` not configured."
+                               if [ -f ${Makefile} ] ; then
+                                       echo '***' "${Makefile} already exists in source directory.  `pwd` not configured." 1>&2

                                        exit 1
                                fi
 
                                if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
                                cd ${hostsubdir}
 
                                        exit 1
                                fi
 
                                if [ ! -d ${hostsubdir} ] ; then mkdir ${hostsubdir} ; fi
                                cd ${hostsubdir}
 

-                               if [ ! -d ${targetsubdir} ] ; then mkdir ${targetsubdir} ; fi
+                               if [ ! -d ${targetsubdir} ] ; then
+                                       if [ -z "${commontargets}" ] ; then
+                                               mkdir ${targetsubdir}
+                                       else
+                                               if [ ! -d Target-independent ] ; then
+                                                       mkdir Target-independent
+                                               fi
+
+                                               ${symbolic_link} Target-independent ${targetsubdir}
+                                       fi # if target independent
+                               fi # if no target dir yet
+

                                cd ${targetsubdir}
 
                                srcdir=../..
                        else
                                # if not subdir builds, then make sure none exist.
                                if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
                                cd ${targetsubdir}
 
                                srcdir=../..
                        else
                                # if not subdir builds, then make sure none exist.
                                if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then

-                                       echo "Configured subdirs exist.  `pwd` not configured."
+                                       echo '***' "Configured subdirs exist.  `pwd` not configured." 1>&2

                                        exit 1
                                fi
                        fi
                                        exit 1
                                fi
                        fi


@@ -358,12 +481,12 @@ for host in ${hosts} ; do
 
                        if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
                                if [ -z "${srcdirdefaulted}" ] ; then
 
                        if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
                                if [ -z "${srcdirdefaulted}" ] ; then

-                                       echo "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2
+                                       echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/${srcdir}" 1>&2

                                else
                                else

-                                       echo "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 1>&2
+                                       echo '***' "${progname}: Can't find ${srcname} sources in `pwd`/. or `pwd`/.." 1>&2

                                fi
 
                                fi
 

-                               echo \(At least ${srctrigger} is missing.\) 1>&2
+                               echo '***' \(At least ${srctrigger} is missing.\) 1>&2

                                exit 1
                        fi
 
                                exit 1
                        fi
 


@@ -377,8 +500,8 @@ for host in ${hosts} ; do
                                set ${links}; link=$1; shift; links=$*
 
                                if [ ! -r ${srcdir}/${file} ] ; then
                                set ${links}; link=$1; shift; links=$*
 
                                if [ ! -r ${srcdir}/${file} ] ; then

-                                       echo "${progname}: cannot create a link \"${link}\"," 1>&2
-                                       echo "since the file \"${file}\" does not exist." 1>&2
+                                       echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
+                                       echo '***' "since the file \"${file}\" does not exist." 1>&2

                                        exit 1
                                fi
 
                                        exit 1
                                fi
 


@@ -388,10 +511,13 @@ for host in ${hosts} ; do
                                ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
 
                                if [ ! -r ${link} ] ; then
                                ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
 
                                if [ ! -r ${link} ] ; then

-                                       echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
+                                       echo '***' "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2

                                        exit 1
                                fi
                                        exit 1
                                fi

-                               echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
+
+                               if [ -n "${verbose}" ] ; then
+                                       echo "Linked \"${link}\" to \"${srcdir}/${file}\"."
+                               fi

                        done
 
                        # Create a .gdbinit file which runs the one in srcdir
                        done
 
                        # Create a .gdbinit file which runs the one in srcdir


@@ -417,68 +543,76 @@ for host in ${hosts} ; do
 
                        # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
                        if [ "${host}" != "${target}" ] ; then
 
                        # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
                        if [ "${host}" != "${target}" ] ; then

-                               echo "CROSS=-DCROSS_COMPILE" > Makefile
-                               echo "ALL=start.encap" >> Makefile
+                               echo "CROSS=-DCROSS_COMPILE" > ${Makefile}
+                               echo "ALL=start.encap" >> ${Makefile}

                        else
                        else

-                               echo "ALL=all.internal" > Makefile
+                               echo "ALL=all.internal" > ${Makefile}

                        fi
 
                        # set target, host, VPATH
                        fi
 
                        # set target, host, VPATH

-                       echo "host = ${host}" >> Makefile
-                       echo "target = ${target}" >> Makefile
-
-                       if [ -n "${forcesubdirs}" ] ; then
-                               echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
+                       echo "host_alias = ${host_alias}" >> ${Makefile}
+                       echo "host_cpu = ${host_cpu}" >> ${Makefile}
+                       echo "host_vendor = ${host_vendor}" >> ${Makefile}
+                       echo "host_os = ${host_os}" >> ${Makefile}
+
+                       echo "target_alias = ${target_alias}" >> ${Makefile}
+                       echo "target_cpu = ${target_cpu}" >> ${Makefile}
+                       echo "target_vendor = ${target_vendor}" >> ${Makefile}
+                       echo "target_os = ${target_os}" >> ${Makefile}
+
+                       if [ -n "${subdirs}" ] ; then
+                               echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}

                        else
                        else

-                               echo "subdir =" >> Makefile
+                               echo "subdir =" >> ${Makefile}

                        fi
 
                        fi
 

-               #       echo "workdir = `pwd`" >> Makefile
-                       echo "VPATH = ${srcdir}" >> Makefile
+               #       echo "workdir = `pwd`" >> ${Makefile}
+                       echo "VPATH = ${srcdir}" >> ${Makefile}

 
 

-                       # add Makefile.in
-                       cat ${srcdir}/Makefile.in >> Makefile
+                       # add "Makefile.in" (or whatever it's called)
+                       cat ${srcdir}/${Makefile_in} >> ${Makefile}

 
 

-                       # and shake thoroughly.

                        # Conditionalize the makefile for this host.
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
                        # Conditionalize the makefile for this host.
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then

-                               sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
-                               mv Makefile.tem Makefile
+                               (echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" ; 
+                                       sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile}) > Makefile.tem
+                               mv Makefile.tem ${Makefile}

                        fi
 
                        # Conditionalize the makefile for this target.
                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then
                        fi
 
                        # Conditionalize the makefile for this target.
                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then

-                               sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
-                               mv Makefile.tem Makefile
+                               (echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" ; 
+                                       sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
+                               mv Makefile.tem ${Makefile}

                        fi
 
                        # set srcdir
                        fi
 
                        # set srcdir

-                       sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
-                       mv Makefile.tem Makefile
+                       sed "s@^srcdir = \.@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}

 
                        # set destdir
                        if [ -n "${destdir}" ] ; then
 
                        # set destdir
                        if [ -n "${destdir}" ] ; then

-                               sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
-                               mv Makefile.tem Makefile
+                               sed "s:^destdir =.*$:destdir = ${destdir}:" ${Makefile} > Makefile.tem
+                               mv Makefile.tem ${Makefile}

                        fi
 
                        fi
 

-                       # Remove all formfeeds, since some Makes get confused by them.
-                       sed "s/\f//" Makefile >> Makefile.tem
-                       mv Makefile.tem Makefile
-

                        # reset SUBDIRS
                        # reset SUBDIRS

-                       sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" Makefile > Makefile.tem
-                       mv Makefile.tem Makefile
+                       sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}

 
                        # reset NONSUBDIRS
 
                        # reset NONSUBDIRS

-                       sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" Makefile > Makefile.tem
-                       mv Makefile.tem Makefile
+                       sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}

 
                        using=
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
                                using=" using \"${host_makefile_frag}\""
                        fi
 
 
                        using=
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
                                using=" using \"${host_makefile_frag}\""
                        fi
 

+                       # remove any form feeds.
+                       sed -e "s/\f//" ${Makefile} > Makefile.tem
+                       mv Makefile.tem ${Makefile}
+

                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then
                                if [ -z "${using}" ] ; then
                                        andusing=" using \"${target_makefile_frag}\""
                        if [ -f ${srcdir}/${target_makefile_frag} ] ; then
                                if [ -z "${using}" ] ; then
                                        andusing=" using \"${target_makefile_frag}\""


@@ -489,182 +623,72 @@ for host in ${hosts} ; do
                                andusing=${using}
                        fi
 
                                andusing=${using}
                        fi
 

-                       echo "Created \"Makefile\"" in `pwd`${andusing}.
-
-                       if [ "${host}" = "${target}" ] ; then
-                               echo "Links are now set up for use with a ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
-                       else
-                               echo "Links are now set up for host ${host} and target ${target}." \
-                                       > config.status
-               #                       | tee ${srcdir}/config.status
+                       if [ -n "${verbose}" -o -z "${recurring}" ] ; then
+                               echo "Created \"${Makefile}\"" in `pwd`${andusing}.

                        fi
 
                        fi
 

+#### configure.in post-target parts come in here.
+
+## end of post-target part.
+
+                       # describe the chosen configuration in config.status.
+                       # Make that file a shellscript which will reestablish
+                       # the same configuration.  Used in Makefiles to rebuild
+                       # Makefiles.
+
+                       echo "#!/bin/sh
+# ${srcname} was configured as follows:
+${srcdir}/configure" ${arguments} `if [ -z "${norecursion}" ] ; then echo +norecursion ; else true ; fi` > config.status
+                       chmod a+x config.status
+

                        originaldir=`pwd`
                        cd ${srcdir}
                fi
                        originaldir=`pwd`
                        cd ${srcdir}
                fi

-       done # for each target
-
-#      # Now build a Makefile for this host.
-#      if [ -n "${forcesubdirs}" ] ; then
-#              cd ${hostsubdir}
-#              cat > GNUmakefile << E!O!F
-## Makefile generated by configure for host ${host}.
-#
-#%:
-#      for i in ${targets} ; do \
-#              $(MAKE) -C Target-\$i \$@
-#
-#all clean stage1 stage2 stage3 stage4etags tags TAGS
-#E!O!F
-#      fi
-done # for each host

 
 

-# If there are subdirectories, then recurse. 
-
-if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
+               # If there are subdirectories, then recurse. 
+               if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then 
+                       for configdir in ${configdirs} ; do
+                               if [ -n "${verbose}" ] ; then
+                                       echo Configuring ${configdir}...
+                               fi

 
 

-# configdirs is not null
-for configdir in ${configdirs} ; do
-       echo Configuring ${configdir}...
-       specifics=
-       commons=
+                               if [ -d ${configdir} ] ; then
+                                       (cd ${configdir} ;
+                                               ./configure +recurring ${host_alias} +target=${target_alias} \
+                                                       ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
+                                               | sed 's/^/     /'
+                               else
+                                       if [ -n "${verbose}" ] ; then
+                                               echo Warning: directory \"${configdir}\" is missing.
+                                       fi
+                               fi
+                       done
+               fi
+       done # for each target

 
 

-       if [ -n "${defaulttargets}" ] ; then
-               for host in ${hosts} ; do
-                       if [ -d ${configdir}.${host} ] ; then
-                               newspecifics="${specifics} ${host}"
-                               specifics=${newspecifics}
-                       else
-                               newcommons="${commons} ${host}"
-                               commons=${newcommons}
-                       fi # if target specific
-               done # for each host
-
-               if [ -n "${commons}" ] ; then
-                       if [ -d ${configdir} ] ; then
-                               (cd ${configdir} ;
-                                       ./configure ${commons} ${verbose} ${forcesubdirs} ${removing} "+destdir=${destdir}") \
-                                       | sed 's/^/     /'
-                       else
-                               echo Warning: directory \"${configdir}\" is missing.
-                       fi
-               fi # if any common hosts
-
-               if [ -n "${specifics}" ] ; then
-                       for host in ${specifics} ; do
-                               echo Configuring target specific directory ${configdir}.${host}...
-                               (cd ${configdir}.${host} ;
-                                       ./configure ${host} ${verbose} ${forcesubdirs} ${removing} "+destdir=${destdir}") \
-                                       | sed 's/^/     /'
-                       done # for host in specifics
-               fi # if there are any specifics
-       else
+       # Now build a Makefile for this host.
+       if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
+               cd ${hostsubdir}
+               cat > GNUmakefile << E!O!F
+# Makefile generated by configure for host ${host_alias}.

 
 

-               for target in ${targets} ; do
-                       if [ -d ${configdir}.${target} ] ; then
-                               newspecifics="${specifics} ${target}"
-                               specifics=${newspecifics}
-                       else
-                               newcommons="${commons} +target=${target}"
-                               commons=${newcommons}
-                       fi
+ALL := $(shell ls -d Target-*)

 
 

-               done # check for target specific dir override
+%:
+       $(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true

 
 

-               if [ -n "${verbose}" ] ; then
-                       echo "  "commons=\"${commons}\"
-                       echo "  "specifics=\"${specifics}\"
-               fi # if verbose
-
-               if [ -n "${commons}" ] ; then
-                       if [ -d ${configdir} ] ; then
-                               (cd ${configdir} ;
-                                       ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons} "+destdir=${destdir}") \
-                                       | sed 's/^/     /'
-                       else
-                               echo Warning: directory \"${configdir}\" is missing.
-                       fi
-               fi # if any commons
-
-               if [ -n "${specifics}" ] ; then
-                       for target in ${specifics} ; do
-                               echo Configuring target specific directory ${configdir}.${target}...
-                               (cd ${configdir}.${target} ;
-                                       ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}" "+destdir=${destdir}") \
-                                       | sed 's/^/     /'
-                       done
-               fi # if any specifics
-       fi # not default targets
-done
+all:
+E!O!F
+               cd ..
+       fi
+done # for each host

 
 exit 0
 
 
 exit 0
 

-#
-# $Log$
-# Revision 1.14  1991/07/15 23:43:20  steve
-# Fixed a few bugs, added 29k coff support.
-#
-# Revision 1.13  1991/06/12  21:24:30  rich
-# correctly propogate destdir
-#
-# Revision 1.17  1991/06/09  20:39:58  rich
-# Added +clib option.
-#
-# Revision 1.16  1991/05/27  21:04:21  rich
-# Removed clib for now.
-#
-# Revision 1.15  1991/05/27  20:54:24  rich
-# fixed a bug in multiple targets
-#
-# Revision 1.14  1991/05/22  01:44:04  rich
-# remove gdb until config issues resolve.
-#
-# Revision 1.13  1991/05/19  08:00:09  rich
-# Added gdb.
-#
-# Revision 1.12  1991/05/19  00:32:13  rich
-# Changes to deal with missing subdirs gracefully, and changes dictated
-# from dropping configure over gdb.
-#
-# Revision 1.4  1991/05/19  00:16:45  rich
-# Configure for gdb.
-#
-# Revision 1.10  1991/05/04  00:58:38  rich
-# Fix program name bug.
-#
-# Revision 1.9  1991/05/03  19:14:18  rich
-# Changed getopt to libiberty, commented out an aborted attempt at host
-# level Makefiles because it caused errors on +rm, add a warning for
-# directories expected to be removed on +rm but that don't exist.
-#
-# Revision 1.8  1991/04/24  16:50:59  rich
-# Three staging checkpoint.
-#
-# Revision 1.7  1991/04/17  01:34:47  rich
-# Added getopt for binutils, fixed problem with host dependancies in
-# configure.template.
-#
-# Revision 1.6  1991/04/16  00:18:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.5  1991/04/15  23:43:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.4  1991/04/13  02:11:03  rich
-# Config cut 3.  We now almost install a29k.
-#
-# Revision 1.3  1991/04/11  02:41:54  rich
-# Cut 2 config.  Subdirs.
-#
-#
-#
-

 #
 # Local Variables:
 # fill-column: 131
 # End:
 #
 
 #
 # Local Variables:
 # fill-column: 131
 # End:
 #
 

-# end of configure.template
+# end of configure