espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-09-10 01:42:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

* configure: Add support for 'subdirs' variable, which is

Browse Source 
like 'configdirs', except that configure doesn't re-invoke
	itself for subdirs, it just creates a Makefile for each subdir.
	* configure.texi:  Document subdirs.
This commit is contained in:
Per Bothner
1992-04-14 19:02:48 +00:00
parent 13b5a7ff3e
commit 8becd045a3
3 changed files with 254 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Apr 14 11:56:09 1992 Per Bothner (bothner@cygnus.com)
* configure: Add support for 'subdirs' variable, which is
like 'configdirs', except that configure doesn't re-invoke
itself for subdirs, it just creates a Makefile for each subdir.
* configure.texi: Document subdirs.
Mon Apr 13 18:50:16 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) Mon Apr 13 18:50:16 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com)
* configure.in: added flex to configdirs * configure.in: added flex to configdirs

392
configure vendored
View File

@ -62,6 +62,7 @@ next_srcdir=
next_target= next_target=
next_tmpdir= next_tmpdir=
norecursion= norecursion=
removing=
prefix=/usr/local prefix=/usr/local
progname= progname=
program_prefix= program_prefix=
@ -72,6 +73,7 @@ site_option=
site_makefile_frag= site_makefile_frag=
srcdir= srcdir=
srctrigger= srctrigger=
subdirs=
target_alias= target_alias=
target_makefile_frag= target_makefile_frag=
undefinedargs= undefinedargs=
@ -171,6 +173,7 @@ do
-prefix | --prefix | --prefi | --pref | --pre) -prefix | --prefix | --prefi | --pref | --pre)
next_prefix=yes next_prefix=yes
;; ;;
-rm | --rm) removing=${arg} ;;
-program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | --program_=* | --program=* | --progra=* | --progr=* | --prog=* | --pro=*) -program_prefix=* | --program_prefix=* | --program_prefi=* | --program_pref=* | --program_pre=* | --program_pr=* | --program_p=* | --program_=* | --program=* | --progra=* | --progr=* | --prog=* | --pro=*)
program_prefix=`echo ${arg} | sed 's/^[-a-z]*=//'` program_prefix=`echo ${arg} | sed 's/^[-a-z]*=//'`
program_prefixoption=${arg} program_prefixoption=${arg}
@ -357,7 +360,7 @@ esac
# default exec_prefix # default exec_prefix
case "${exec_prefix}" in case "${exec_prefix}" in
"") exec_prefix="$(prefix)" ;; "") exec_prefix="\$(prefix)" ;;
*) ;; *) ;;
esac esac
@ -450,116 +453,149 @@ if [ ! -r ${srcdir}/${srctrigger} ] ; then
exit 1 exit 1
fi fi
# Set up the list of links to be made. for subdir in . ${subdirs} ; do
# ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links. # ${subdir} is relative path from . to the directory we're currently
configlinks="${links}" # configuring.
while [ -n "${files}" ] ; do # ${invsubdir} is inverse of ${subdir), *with* trailing /, if needed.
# set file to car of files, files to cdr of files invsubdir=`echo ${subdir}/ | sed -e 's|\./||g' -e 's|[^/]*/|../|g'`
set ${files}; file=$1; shift; files=$*
set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ] ; then ### figure out what to do with srcdir
echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2 case "${srcdir}" in
echo '***' "since the file \"${file}\" does not exist." 1>&2 ".") # no -srcdir option. We're building in place.
exit 1 makesrcdir=. ;;
fi /*) # absolute path
makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'`
${remove} -f ${link}
rm -f config.status
# Make a symlink if possible, otherwise try a hard link
${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
exit 1
fi
case "${verbose}" in
"") ;;
*) echo "Linked \"${link}\" to \"${srcdir}/${file}\"." ;;
esac
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
if [ -r ${srcdir}/.gdbinit ] ; then
case ${srcdir} in
.)
;; ;;
*) cat > .gdbinit <<EOF *) # otherwise relative
# ${NO_EDIT} > .gdbinit makesrcdir=../${srcdir}/${subdir}
dir .
dir ${srcdir}
source ${srcdir}/.gdbinit
EOF
;; ;;
esac esac
fi
# Install a makefile, and make it set VPATH if [ "${subdir}/" != "./" ] ; then
# if necessary so that the sources are found. Makefile=${subdir}/Makefile
# Also change its value of srcdir. fi
# NOTE: Makefile generation constitutes the majority of the time in configure. Hence, this section has
# been somewhat optimized and is perhaps a bit twisty.
# code is order so as to try to sed the smallest input files we know. case "${removing}" in
"")
# the three makefile fragments MUST end up in the resulting Makefile in this order: target, host, and site. if [ -n "${verbose}" -o -z "${silent}" ] ; then
# so do these separately because I don't trust the order of sed -e expressions. echo Building in ${subdir}
# Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
case "${site}" in
"") cp ${srcdir}/${Makefile_in} Makefile.tem ;;
*)
site_makefile_frag=${srcdir}/config/ms-${site}
if [ -f ${site_makefile_frag} ] ; then
sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${Makefile_in} \
> Makefile.tem
else
cp ${srcdir}/${Makefile_in} Makefile.tem
site_makefile_frag=
fi fi
;; # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest)
esac # Set up the list of links to be made.
# working copy now in Makefile.tem # ${links} is the list of link names, and ${files} is the list of names to link to.
# Conditionalize the makefile for this host. # Make the links.
case "${host_makefile_frag}" in configlinks="${links}"
"") mv Makefile.tem ${Makefile} ;; while [ -n "${files}" ] ; do
*) # set file to car of files, files to cdr of files
host_makefile_frag=${srcdir}/${host_makefile_frag} set ${files}; file=$1; shift; files=$*
if [ -f ${host_makefile_frag} ] ; then set ${links}; link=$1; shift; links=$*
sed -e "/^####/ r ${host_makefile_frag}" Makefile.tem > ${Makefile}
else
echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
echo '***' is missing in ${PWD}. 1>&2
mv Makefile.tem ${Makefile}
fi
esac
# working copy now in ${Makefile}
# Conditionalize the makefile for this target. if [ ! -r ${srcdir}/${file} ] ; then
case "${target_makefile_frag}" in echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
"") mv ${Makefile} Makefile.tem ;; echo '***' "since the file \"${file}\" does not exist." 1>&2
*) exit 1
target_makefile_frag=${srcdir}/${target_makefile_frag} fi
if [ -f ${target_makefile_frag} ] ; then
sed -e "/^####/ r ${target_makefile_frag}" ${Makefile} > Makefile.tem
else
mv ${Makefile} Makefile.tem
target_makefile_frag=
fi
;;
esac
# real copy now in Makefile.tem
# prepend warning about editting, and a bunch of variables. ${remove} -f ${link}
cat > ${Makefile} <<EOF rm -f config.status
# Make a symlink if possible, otherwise try a hard link
${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
exit 1
fi
case "${verbose}" in
"") ;;
*) echo "Linked \"${link}\" to \"${srcdir}/${file}\"." ;;
esac
done
# Create a .gdbinit file which runs the one in srcdir
# and tells GDB to look there for source files.
if [ -r ${srcdir}/${subdir}/.gdbinit ] ; then
case ${srcdir} in
.)
;;
*) cat > ${subdir}/.gdbinit <<EOF
# ${NO_EDIT} # ${NO_EDIT}
dir .
dir ${makesrcdir}
source ${makesrcdir}/.gdbinit
EOF
;;
esac
fi
# Install a makefile, and make it set VPATH
# if necessary so that the sources are found.
# Also change its value of srcdir.
# NOTE: Makefile generation constitutes the majority of the time in configure. Hence, this section has
# been somewhat optimized and is perhaps a bit twisty.
# code is order so as to try to sed the smallest input files we know.
# the three makefile fragments MUST end up in the resulting Makefile in this order: target, host, and site.
# so do these separately because I don't trust the order of sed -e expressions.
# Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
case "${site}" in
"") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
*)
site_makefile_frag=${srcdir}/config/ms-${site}
if [ -f ${site_makefile_frag} ] ; then
sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \
> ${subdir}/Makefile.tem
else
cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
site_makefile_frag=
fi
;;
esac
# working copy now in ${subdir}/Makefile.tem
# Conditionalize the makefile for this host.
case "${host_makefile_frag}" in
"") mv ${subdir}/Makefile.tem ${Makefile} ;;
*)
if [ ! -f ${host_makefile_frag} ] ; then
host_makefile_frag=${srcdir}/${host_makefile_frag}
fi
if [ -f ${host_makefile_frag} ] ; then
sed -e "/^####/ r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
else
echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
echo '***' is missing in ${PWD}. 1>&2
mv ${subdir}/Makefile.tem ${Makefile}
fi
esac
# working copy now in ${Makefile}
# Conditionalize the makefile for this target.
case "${target_makefile_frag}" in
"") mv ${Makefile} ${subdir}/Makefile.tem ;;
*)
target_makefile_frag=${srcdir}/${target_makefile_frag}
if [ -f ${target_makefile_frag} ] ; then
sed -e "/^####/ r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
else
mv ${Makefile} ${subdir}/Makefile.tem
target_makefile_frag=
fi
;;
esac
# real copy now in ${subdir}/Makefile.tem
# prepend warning about editting, and a bunch of variables.
cat > ${Makefile} <<EOF
# ${NO_EDIT}
VPATH = ${makesrcdir}
links = ${configlinks}
host_alias = ${host_alias} host_alias = ${host_alias}
host_cpu = ${host_cpu} host_cpu = ${host_cpu}
host_vendor = ${host_vendor} host_vendor = ${host_vendor}
@ -568,84 +604,106 @@ target_alias = ${target_alias}
target_cpu = ${target_cpu} target_cpu = ${target_cpu}
target_vendor = ${target_vendor} target_vendor = ${target_vendor}
target_os = ${target_os} target_os = ${target_os}
target_makefile_frag = ${target_makefile_frag}
host_makefile_frag = ${host_makefile_frag}
site_makefile_frag = ${site_makefile_frag}
links = ${configlinks}
VPATH = ${srcdir}
EOF EOF
if [ "${target_makefile_frag}" != "" ] ; then
echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile}
fi
if [ "${host_makefile_frag}" != "" ] ; then
echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile}
fi
if [ "${site_makefile_frag}" != "" ] ; then
echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
fi
# fixme: this shouldn't be in configure. # fixme: this shouldn't be in configure.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler. # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
case "${host_alias}" in case "${host_alias}" in
"${target_alias}") "${target_alias}")
tooldir="$(libdir)" tooldir="\$(libdir)"
echo "ALL=all.internal" >> ${Makefile} echo "ALL=all.internal" >> ${Makefile}
;; ;;
*) *)
echo "CROSS=-DCROSS_COMPILE" >> ${Makefile} echo "CROSS=-DCROSS_COMPILE" >> ${Makefile}
echo "ALL=all.cross" >> ${Makefile} echo "ALL=all.cross" >> ${Makefile}
case "${program_prefix}" in case "${program_prefix}" in
"") program_prefix=${target_alias}- ;; "") program_prefix=${target_alias}- ;;
*) ;; *) ;;
esac
tooldir="\$(libdir)/${target_alias}"
;;
esac esac
tooldir="$(libdir)/${target_alias}" # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
;; # remove any form feeds.
esac if [ -z "${subdirs}" ]; then
sed -e "s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:" \
-e "s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
${subdir}/Makefile.tem > ${subdir}/Makefile.tem2
mv ${subdir}/Makefile.tem2 ${subdir}/Makefile.tem
fi
sed -e "s:^prefix[ ]*=.*$:prefix = ${prefix}:" \
-e "s:^exec_prefix[ ]*=.*$:exec_prefix = ${exec_prefix}:" \
-e "s:^srcdir[ ]*=.*$:srcdir = ${makesrcdir}:" \
-e "s/ //" \
-e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \
-e "s:^tooldir[ ]*=.*$:tooldir = ${tooldir}:" \
${subdir}/Makefile.tem >> ${Makefile}
# final copy now in ${Makefile}
# reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, remove any form rm ${subdir}/Makefile.tem
# feeds.
sed -e "s:^prefix[ ]*=.*$:prefix = ${prefix}:" \
-e "s:^exec_prefix[ ]*=.*$:exec_prefix = ${exec_prefix}:" \
-e "s:^srcdir[ ]*=.*$:srcdir = ${srcdir}:" \
-e "s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}:" \
-e "s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
-e "s/ //" \
-e "s:^program_prefix[ ]*=.*$:program_prefix = ${program_prefix}:" \
-e "s:^tooldir[ ]*=.*$:tooldir = ${tooldir}:" \
Makefile.tem >> ${Makefile}
# final copy now in ${Makefile}
rm Makefile.tem if [ -n "${verbose}" -o -z "${silent}" ] ; then
case "${host_makefile_frag}" in
"") using= ;;
*) using="and \"${host_makefile_frag}\"" ;;
esac
if [ -n "${verbose}" -o -z "${silent}" ] ; then case "${target_makefile_frag}" in
case "${host_makefile_frag}" in "") ;;
"") using= ;; *) using="${using} and \"${target_makefile_frag}\"" ;;
*) using="and \"${host_makefile_frag}\"" ;; esac
case "${site_makefile_frag}" in
"") ;;
*) using="${using} and \"${site_makefile_frag}\"" ;;
esac
echo "Created \"${Makefile}\" in" ${PWD} `echo "${using}" | sed 's/and/using/'`
fi
. ${tmpfile}.pos
# describe the chosen configuration in config.status.
# Make that file a shellscript which will reestablish
# the same configuration. Used in Makefiles to rebuild
# Makefiles.
case "${norecursion}" in
"") arguments="${arguments} -norecursion" ;;
*) ;;
esac esac
case "${target_makefile_frag}" in if [ ${subdir} = . ] ; then
"") ;; echo "#!/bin/sh
*) using="${using} and \"${target_makefile_frag}\"" ;;
esac
case "${site_makefile_frag}" in
"") ;;
*) using="${using} and \"${site_makefile_frag}\"" ;;
esac
echo "Created \"${Makefile}\" in" ${PWD} `echo "${using}" | sed 's/and/using/'`
fi
. ${tmpfile}.pos
# describe the chosen configuration in config.status.
# Make that file a shellscript which will reestablish
# the same configuration. Used in Makefiles to rebuild
# Makefiles.
case "${norecursion}" in
"") arguments="${arguments} -norecursion" ;;
*) ;;
esac
echo "#!/bin/sh
# ${NO_EDIT} # ${NO_EDIT}
# ${PWD} was configured as follows: # ${PWD} was configured as follows:
${progname}" ${arguments} " ${progname}" ${arguments} "
# ${using}" > config.status # ${using}" > ${subdir}/config.status
chmod a+x config.status else
echo "#!/bin/sh
# ${NO_EDIT}
# ${PWD}/${subdir} was configured as follows:
cd ${invsubdir}
${progname}" ${arguments} "
# ${using}" > ${subdir}/config.status
fi
chmod a+x ${subdir}/config.status
;;
*) rm -f ${Makefile} ${subdir}/config.status ${links} ;;
esac
done
# If there are subdirectories, then recur. # If there are subdirectories, then recur.
if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
@ -694,7 +752,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
### The recursion line is here. ### The recursion line is here.
if ${recprog} -s ${host_alias} -target=${target_alias} \ if ${recprog} -s ${host_alias} -target=${target_alias} \
${verbose} ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \ ${verbose} ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
${srcdiroption} ${program_prefixoption} ${site_option} ; then ${srcdiroption} ${program_prefixoption} ${site_option} ${removing} ; then
true true
else else
exit 1 exit 1

27
configure.texi
View File

@ -983,13 +983,30 @@ error message.
@defvar{configdirs} @defvar{configdirs}
Contains the names of any subdirectories where @code{configure} should Contains the names of any subdirectories where @code{configure} should
recur. You must usually set this in the per-invocation section of recur. You must usually set this in the per-invocation section of
@file{configure.in}. If @file{Makefile.in} contains a line starting @file{configure.in}.
with @code{SUBDIRS =}, then it will be replaced with an assignment to If @file{Makefile.in} contains a line starting with @code{SUBDIRS =},
@code{SUBDIRS} using the value of @code{configdirs}. This can be used then it will be replaced with an assignment to @code{SUBDIRS} using
to determine which directories to configure and build depending on the the value of @code{configdirs} (if #code{subdirs} is empty). This can
host and target configurations. be used to determine which directories to configure and build depending
on the host and target configurations.
@c Most other matching makefile/config vars use the same name. Why not @c Most other matching makefile/config vars use the same name. Why not
@c this? (FIXME). @c this? (FIXME).
@c Can we get rid of SUBDIRS-substitution? It doesn't work well with subdirs.
Use @code{configdirs} (instead of the @code{subdirs} variable
described below) if you want to be able to partition the
sub-directories, or use independent Makefile fragments.
Each sub-directory can be independent, and independently re-configured.
@end defvar
@defvar{subdirs}
Contains the names of any subdirectories where @code{configure} should
create a @code{Makefile} (in addition to the current directory),
@emph{without} recursively running @code{configure}.
Use @code{subdirs} (instead of the @code{configdirs} variable
described above) if you want to configure all of the directories
as a unit. Since there is a single invocation of @code{configure}
that configures many directories, all the directories can use the
same Makefile fragments, and the same @code{configure.in}.
@end defvar @end defvar
@defvar{host} @defvar{host}