2002-09-22 Nathanael Nerode <neroden@gcc.gnu.org>

* Makefile.def: New file.
	* Makefile.tpl: New file.
	* Makefile.in: Generate from Makefile.tpl with 'autogen Makefile.def'.

	* configure.in: Minor rearrangement.  Simplify tests.
This commit is contained in:
Nathanael Nerode 2002-09-24 23:01:30 +00:00
parent 6e1dfd2d96
commit bba0272654
5 changed files with 1961 additions and 33 deletions

View File

@ -1,3 +1,11 @@
2002-09-22 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.def: New file.
* Makefile.tpl: New file.
* Makefile.in: Generate from Makefile.tpl with 'autogen Makefile.def'.
* configure.in: Minor rearrangement. Simplify tests.
2002-09-23 Jason Thorpe <thorpej@wasabisystems.com>
* configure.in (with_headers): Skip copy if value is "yes".

65
Makefile.def Normal file
View File

@ -0,0 +1,65 @@
#! /usr/bin/autogen
AutoGen definitions Makefile.tpl;
host_modules= { module= ash; };
host_modules= { module= autoconf; };
host_modules= { module= automake; };
host_modules= { module= bash; };
host_modules= { module= bfd; };
// Put install-opcodes before install-binutils: should be Makefile dependency.
host_modules= { module= opcodes; };
host_modules= { module= binutils; };
host_modules= { module= bison; no_check_cross= true; };
host_modules= { module= byacc; no_check_cross= true; };
host_modules= { module= bzip2; };
host_modules= { module= db; };
host_modules= { module= dejagnu; };
host_modules= { module= diff; };
host_modules= { module= dosutils; no_check= true; };
host_modules= { module= etc; };
host_modules= { module= fastjar; no_check_cross= true; };
host_modules= { module= fileutils; };
host_modules= { module= findutils; };
host_modules= { module= find; };
host_modules= { module= flex; no_check_cross= true; };
host_modules= { module= gas; };
host_modules= { module= gawk; };
host_modules= { module= gettext; };
host_modules= { module= gnuserv; };
host_modules= { module= gprof; };
host_modules= { module= grep; };
host_modules= { module= gzip; };
host_modules= { module= hello; };
host_modules= { module= indent; };
host_modules= { module= intl; };
// Put install-tcl before install-itcl: should be Makefile dependency.
host_modules= { module= tcl; };
host_modules= { module= itcl; };
host_modules= { module= ld; };
host_modules= { module= libgui; };
host_modules= { module= libiberty; };
host_modules= { module= libtool; };
host_modules= { module= m4; };
host_modules= { module= make; };
host_modules= { module= mmalloc; no_check=true; };
host_modules= { module= patch; };
host_modules= { module= perl; };
host_modules= { module= prms; };
host_modules= { module= rcs; };
host_modules= { module= readline; };
host_modules= { module= release; no_install= true; no_check= true; };
host_modules= { module= recode; };
host_modules= { module= sed; };
host_modules= { module= send-pr; };
host_modules= { module= shellutils; };
host_modules= { module= sid; };
host_modules= { module= sim; };
host_modules= { module= snavigator; };
host_modules= { module= tar; };
host_modules= { module= texinfo; no_install= true; };
host_modules= { module= textutils; };
host_modules= { module= time; };
host_modules= { module= uudecode; };
host_modules= { module= wdiff; };
host_modules= { module= zip; no_check_cross=true; };
host_modules= { module= zlib; no_install=true; no_check=true; };

View File

@ -1,3 +1,5 @@
# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
#
# Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
@ -529,6 +531,7 @@ ALL_MODULES = \
all-automake \
all-bash \
all-bfd \
all-opcodes \
all-binutils \
all-bison \
all-byacc \
@ -553,6 +556,7 @@ ALL_MODULES = \
all-hello \
all-indent \
all-intl \
all-tcl \
all-itcl \
all-ld \
all-libgui \
@ -561,7 +565,6 @@ ALL_MODULES = \
all-m4 \
all-make \
all-mmalloc \
all-opcodes \
all-patch \
all-perl \
all-prms \
@ -576,7 +579,6 @@ ALL_MODULES = \
all-sim \
all-snavigator \
all-tar \
all-tcl \
all-texinfo \
all-textutils \
all-time \
@ -605,6 +607,7 @@ CROSS_CHECK_MODULES = \
check-automake \
check-bash \
check-bfd \
check-opcodes \
check-binutils \
check-bzip2 \
check-db \
@ -624,6 +627,7 @@ CROSS_CHECK_MODULES = \
check-hello \
check-indent \
check-intl \
check-tcl \
check-itcl \
check-ld \
check-libgui \
@ -631,8 +635,6 @@ CROSS_CHECK_MODULES = \
check-libtool \
check-m4 \
check-make \
check-mmcheckoc \
check-opcodes \
check-patch \
check-perl \
check-prms \
@ -642,11 +644,10 @@ CROSS_CHECK_MODULES = \
check-sed \
check-send-pr \
check-shellutils \
check-snavigator \
check-sid \
check-sim \
check-snavigator \
check-tar \
check-tcl \
check-texinfo \
check-textutils \
check-time \
@ -669,11 +670,11 @@ INSTALL_MODULES = \
install-automake \
install-bash \
install-bfd \
install-bzip2 \
install-opcodes \
install-binutils \
install-bison \
install-byacc \
install-bzip2 \
install-db \
install-dejagnu \
install-diff \
@ -831,6 +832,7 @@ CLEAN_MODULES = \
clean-automake \
clean-bash \
clean-bfd \
clean-opcodes \
clean-binutils \
clean-bison \
clean-byacc \
@ -855,6 +857,7 @@ CLEAN_MODULES = \
clean-hello \
clean-indent \
clean-intl \
clean-tcl \
clean-itcl \
clean-ld \
clean-libgui \
@ -863,7 +866,6 @@ CLEAN_MODULES = \
clean-m4 \
clean-make \
clean-mmalloc \
clean-opcodes \
clean-patch \
clean-perl \
clean-prms \
@ -878,14 +880,13 @@ CLEAN_MODULES = \
clean-sim \
clean-snavigator \
clean-tar \
clean-tcl \
clean-texinfo \
clean-textutils \
clean-time \
clean-uudecode \
clean-wdiff \
clean-zip \
clean-zlib
clean-zlib
# All of the target modules that can be cleaned
CLEAN_TARGET_MODULES = \

1868
Makefile.tpl Normal file

File diff suppressed because it is too large Load Diff

View File

@ -80,22 +80,6 @@ target_tools="target-examples target-groff target-gperf"
################################################################################
## These two lists are of directories that are to be removed from the
## ${configdirs} list for either cross-compilations or for native-
## compilations. For example, it doesn't make that much sense to
## cross-compile Emacs, nor is it terribly useful to compile target-libiberty in
## a native environment.
# directories to be built in the native environment only
#
# This must be a single line because of the way it is searched by grep in
# the code below.
native_only="autoconf automake libtool fileutils find gawk gettext grep gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms snavigator gnuserv target-gperf"
# directories to be built in a cross environment only
#
cross_only="target-libgloss target-newlib target-opcodes"
## All tools belong in one of the four categories, and are assigned above
## We assign ${configdirs} this way to remove all embedded newlines. This
## is important because configure will choke if they ever get through.
@ -184,8 +168,12 @@ case ${with_x} in
esac
# Some tools are only suitable for building in a "native" situation.
# Remove these if host!=target. Similarly, some are only suitable
# for cross toolchains; remove if host=target.
# Remove these if host!=target.
native_only="autoconf automake libtool fileutils find gawk gettext grep gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms snavigator gnuserv target-gperf"
# Similarly, some are only suitable for cross toolchains.
# Remove these if host=target.
cross_only="target-libgloss target-newlib target-opcodes"
case $is_cross_compiler in
no) skipdirs="${skipdirs} ${cross_only}" ;;
@ -755,8 +743,7 @@ for dir in . $skipdirs $noconfigdirs ; do
dirname=`echo $dir | sed -e s/target-//g`
if test $dir != . && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
if test -r $srcdir/$dirname/configure \
|| test -r $srcdir/$dirname/configure.in ; then
if test -r $srcdir/$dirname/configure ; then
if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
true
else
@ -766,8 +753,7 @@ for dir in . $skipdirs $noconfigdirs ; do
fi
if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
if test -r $srcdir/$dirname/configure \
|| test -r $srcdir/$dirname/configure.in ; then
if test -r $srcdir/$dirname/configure ; then
if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
true
else
@ -783,7 +769,7 @@ if test -n "${target_configdirs}" ; then
others=
for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
if test "$i" != "libiberty" ; then
if test -r $srcdir/$i/configure || test -r $srcdir/$i/configure.in ; then
if test -r $srcdir/$i/configure ; then
others=yes;
break;
fi