fixed a bug in multiple targets
This commit is contained in:
parent
1fb48a6c68
commit
6c18e39366
6 changed files with 208 additions and 111 deletions
59
bfd/configure
vendored
59
bfd/configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -248,12 +251,16 @@ if [ -n "${template}" ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in ${configdir} ${targetspecificdirs} ; do
|
for i in ${configdir} ${targetspecificdirs} ; do
|
||||||
|
if [ -d $i ] ; then
|
||||||
if [ -r $i/configure ] ; then
|
if [ -r $i/configure ] ; then
|
||||||
(cd $i ;
|
(cd $i ;
|
||||||
./configure +template=${template} ${verbose})
|
./configure +template=${template} ${verbose})
|
||||||
else
|
else
|
||||||
echo No configure script in `pwd`/$i
|
echo No configure script in `pwd`/$i
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo Warning: directory $i is missing.
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -274,6 +281,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -282,9 +291,11 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
files=
|
files=
|
||||||
|
@ -425,18 +436,15 @@ links=
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
host_var_file=hmake-${host}
|
|
||||||
target_var_file=tmake-${target}
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Conditionalize the makefile for this target.
|
# Conditionalize the makefile for this target.
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -463,15 +471,15 @@ links=
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
|
|
||||||
using=
|
using=
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
using=" using \"${host_var_file}\""
|
using=" using \"${host_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
if [ -z "${using}" ] ; then
|
if [ -z "${using}" ] ; then
|
||||||
andusing=" using \"${target_var_file}\""
|
andusing=" using \"${target_makefile_frag}\""
|
||||||
else
|
else
|
||||||
andusing="${using} and \"${target_var_file}\""
|
andusing="${using} and \"${target_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
andusing=${using}
|
andusing=${using}
|
||||||
|
@ -531,9 +539,13 @@ for configdir in ${configdirs} ; do
|
||||||
done # for each host
|
done # for each host
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any common hosts
|
fi # if any common hosts
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -563,9 +575,13 @@ for configdir in ${configdirs} ; do
|
||||||
fi # if verbose
|
fi # if verbose
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any commons
|
fi # if any commons
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -583,8 +599,21 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.8 1991/05/14 14:14:25 rich
|
# Revision 1.10 1991/05/27 20:54:38 rich
|
||||||
# see devo/configure 1.11
|
# 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
|
# Revision 1.10 1991/05/04 00:58:38 rich
|
||||||
# Fix program name bug.
|
# Fix program name bug.
|
||||||
|
|
59
binutils/configure
vendored
59
binutils/configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -248,12 +251,16 @@ if [ -n "${template}" ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in ${configdir} ${targetspecificdirs} ; do
|
for i in ${configdir} ${targetspecificdirs} ; do
|
||||||
|
if [ -d $i ] ; then
|
||||||
if [ -r $i/configure ] ; then
|
if [ -r $i/configure ] ; then
|
||||||
(cd $i ;
|
(cd $i ;
|
||||||
./configure +template=${template} ${verbose})
|
./configure +template=${template} ${verbose})
|
||||||
else
|
else
|
||||||
echo No configure script in `pwd`/$i
|
echo No configure script in `pwd`/$i
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo Warning: directory $i is missing.
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -274,6 +281,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -282,9 +291,11 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
files=
|
files=
|
||||||
|
@ -426,18 +437,15 @@ links=
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
host_var_file=hmake-${host}
|
|
||||||
target_var_file=tmake-${target}
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Conditionalize the makefile for this target.
|
# Conditionalize the makefile for this target.
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -464,15 +472,15 @@ links=
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
|
|
||||||
using=
|
using=
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
using=" using \"${host_var_file}\""
|
using=" using \"${host_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
if [ -z "${using}" ] ; then
|
if [ -z "${using}" ] ; then
|
||||||
andusing=" using \"${target_var_file}\""
|
andusing=" using \"${target_makefile_frag}\""
|
||||||
else
|
else
|
||||||
andusing="${using} and \"${target_var_file}\""
|
andusing="${using} and \"${target_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
andusing=${using}
|
andusing=${using}
|
||||||
|
@ -532,9 +540,13 @@ for configdir in ${configdirs} ; do
|
||||||
done # for each host
|
done # for each host
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any common hosts
|
fi # if any common hosts
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -564,9 +576,13 @@ for configdir in ${configdirs} ; do
|
||||||
fi # if verbose
|
fi # if verbose
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any commons
|
fi # if any commons
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -584,8 +600,21 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.8 1991/05/14 14:14:18 rich
|
# Revision 1.10 1991/05/27 20:54:35 rich
|
||||||
# see devo/configure 1.11
|
# 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
|
# Revision 1.10 1991/05/04 00:58:38 rich
|
||||||
# Fix program name bug.
|
# Fix program name bug.
|
||||||
|
|
21
configure
vendored
21
configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -279,6 +282,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -287,11 +292,12 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
|
#### configure.in per-target parts come in here.
|
||||||
## end of per-target part.
|
## end of per-target part.
|
||||||
|
|
||||||
# Temporarily, we support only direct subdir builds.
|
# Temporarily, we support only direct subdir builds.
|
||||||
|
@ -428,14 +434,6 @@ for host in ${hosts} ; do
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
if [ -z "${host_makefile_frag}" ] ; then
|
|
||||||
host_makefile_frag=config/hmake-${host}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${target_makefile_frag}" ] ; then
|
|
||||||
target_makefile_frag=config/tmake-${target}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
|
@ -599,6 +597,9 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
|
# 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
|
# Revision 1.14 1991/05/22 01:44:04 rich
|
||||||
# remove gdb until config issues resolve.
|
# remove gdb until config issues resolve.
|
||||||
#
|
#
|
||||||
|
|
28
gas/configure
vendored
28
gas/configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -278,6 +281,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -286,9 +291,11 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
# assign cpu type
|
# assign cpu type
|
||||||
|
@ -481,14 +488,6 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
if [ -z "${host_makefile_frag}" ] ; then
|
|
||||||
host_makefile_frag=config/hmake-${host}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${target_makefile_frag}" ] ; then
|
|
||||||
target_makefile_frag=config/tmake-${target}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
|
@ -652,7 +651,16 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.10 1991/05/19 00:31:35 rich
|
# Revision 1.11 1991/05/27 20:54:32 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
|
# Changes to deal with missing subdirs gracefully, and changes dictated
|
||||||
# from dropping configure over gdb.
|
# from dropping configure over gdb.
|
||||||
#
|
#
|
||||||
|
|
63
ld/configure
vendored
63
ld/configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -179,7 +182,7 @@ fi
|
||||||
# any existing configure script.
|
# any existing configure script.
|
||||||
|
|
||||||
configdirs=
|
configdirs=
|
||||||
srctrigger=ldver.c
|
srctrigger=ldversion.c
|
||||||
srcname="linker"
|
srcname="linker"
|
||||||
|
|
||||||
## end of common part.
|
## end of common part.
|
||||||
|
@ -249,12 +252,16 @@ if [ -n "${template}" ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in ${configdir} ${targetspecificdirs} ; do
|
for i in ${configdir} ${targetspecificdirs} ; do
|
||||||
|
if [ -d $i ] ; then
|
||||||
if [ -r $i/configure ] ; then
|
if [ -r $i/configure ] ; then
|
||||||
(cd $i ;
|
(cd $i ;
|
||||||
./configure +template=${template} ${verbose})
|
./configure +template=${template} ${verbose})
|
||||||
else
|
else
|
||||||
echo No configure script in `pwd`/$i
|
echo No configure script in `pwd`/$i
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo Warning: directory $i is missing.
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -275,6 +282,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -283,9 +292,11 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
## end of per-target part.
|
## end of per-target part.
|
||||||
|
@ -424,18 +435,15 @@ for host in ${hosts} ; do
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
host_var_file=hmake-${host}
|
|
||||||
target_var_file=tmake-${target}
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Conditionalize the makefile for this target.
|
# Conditionalize the makefile for this target.
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -462,15 +470,15 @@ for host in ${hosts} ; do
|
||||||
mv Makefile.tem Makefile
|
mv Makefile.tem Makefile
|
||||||
|
|
||||||
using=
|
using=
|
||||||
if [ -f ${srcdir}/config/${host_var_file} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
using=" using \"${host_var_file}\""
|
using=" using \"${host_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${srcdir}/config/${target_var_file} ] ; then
|
if [ -f ${srcdir}/${target_makefile_frag} ] ; then
|
||||||
if [ -z "${using}" ] ; then
|
if [ -z "${using}" ] ; then
|
||||||
andusing=" using \"${target_var_file}\""
|
andusing=" using \"${target_makefile_frag}\""
|
||||||
else
|
else
|
||||||
andusing="${using} and \"${target_var_file}\""
|
andusing="${using} and \"${target_makefile_frag}\""
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
andusing=${using}
|
andusing=${using}
|
||||||
|
@ -530,9 +538,13 @@ for configdir in ${configdirs} ; do
|
||||||
done # for each host
|
done # for each host
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any common hosts
|
fi # if any common hosts
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -562,9 +574,13 @@ for configdir in ${configdirs} ; do
|
||||||
fi # if verbose
|
fi # if verbose
|
||||||
|
|
||||||
if [ -n "${commons}" ] ; then
|
if [ -n "${commons}" ] ; then
|
||||||
|
if [ -d ${configdir} ] ; then
|
||||||
(cd ${configdir} ;
|
(cd ${configdir} ;
|
||||||
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
|
||||||
| sed 's/^/ /'
|
| sed 's/^/ /'
|
||||||
|
else
|
||||||
|
echo Warning: directory \"${configdir}\" is missing.
|
||||||
|
fi
|
||||||
fi # if any commons
|
fi # if any commons
|
||||||
|
|
||||||
if [ -n "${specifics}" ] ; then
|
if [ -n "${specifics}" ] ; then
|
||||||
|
@ -582,12 +598,21 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.10 1991/05/14 18:53:32 steve
|
# Revision 1.12 1991/05/27 20:54:42 rich
|
||||||
# Added make dep
|
# fixed a bug in multiple targets
|
||||||
# Made filenames suitable for PCs
|
|
||||||
#
|
#
|
||||||
# Revision 1.9 1991/05/14 14:14:30 rich
|
# Revision 1.14 1991/05/22 01:44:04 rich
|
||||||
# see devo/configure 1.11
|
# 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
|
# Revision 1.10 1991/05/04 00:58:38 rich
|
||||||
# Fix program name bug.
|
# Fix program name bug.
|
||||||
|
|
27
readline/configure
vendored
27
readline/configure
vendored
|
@ -3,6 +3,9 @@
|
||||||
# configure.in and a configure template.
|
# configure.in and a configure template.
|
||||||
configdirs=
|
configdirs=
|
||||||
|
|
||||||
|
# the debugger.
|
||||||
|
#set -x
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Configuration script template
|
# Configuration script template
|
||||||
|
@ -279,6 +282,8 @@ for host in ${hosts} ; do
|
||||||
defaulttargets=true
|
defaulttargets=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
host_makefile_frag=config/hmake-${host}
|
||||||
|
|
||||||
#### configure.in per-host parts come in here.
|
#### configure.in per-host parts come in here.
|
||||||
|
|
||||||
## end of per-host part.
|
## end of per-host part.
|
||||||
|
@ -287,9 +292,11 @@ for host in ${hosts} ; do
|
||||||
for target in ${targets} ; do
|
for target in ${targets} ; do
|
||||||
|
|
||||||
if [ -n "${verbose}" ] ; then
|
if [ -n "${verbose}" ] ; then
|
||||||
echo " "target=\"${target}\"
|
echo host \= \"${host}\", target \= \"${target}\".
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
target_makefile_frag=config/tmake-${target}
|
||||||
|
|
||||||
#### configure.in per-target parts come in here.
|
#### configure.in per-target parts come in here.
|
||||||
|
|
||||||
## end of per-target part.
|
## end of per-target part.
|
||||||
|
@ -428,14 +435,6 @@ for host in ${hosts} ; do
|
||||||
cat ${srcdir}/Makefile.in >> Makefile
|
cat ${srcdir}/Makefile.in >> Makefile
|
||||||
|
|
||||||
# and shake thoroughly.
|
# and shake thoroughly.
|
||||||
if [ -z "${host_makefile_frag}" ] ; then
|
|
||||||
host_makefile_frag=config/hmake-${host}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${target_makefile_frag}" ] ; then
|
|
||||||
target_makefile_frag=config/tmake-${target}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Conditionalize the makefile for this host.
|
# Conditionalize the makefile for this host.
|
||||||
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
|
||||||
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
|
||||||
|
@ -599,8 +598,14 @@ exit 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.1 1991/05/21 19:55:06 rich
|
# Revision 1.2 1991/05/27 20:54:50 rich
|
||||||
# Initial revision
|
# 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
|
# Revision 1.12 1991/05/19 00:32:13 rich
|
||||||
# Changes to deal with missing subdirs gracefully, and changes dictated
|
# Changes to deal with missing subdirs gracefully, and changes dictated
|
||||||
|
|
Loading…
Add table
Reference in a new issue