* Makefile.in, configure, configure.in: merge with foundry-971118-build
This commit is contained in:
Keith Seitz
parent
3885125c8e
commit
2ec9f3fd50
42
ChangeLog
42
ChangeLog
|
|
@ -1,3 +1,12 @@
|
|||
Wed Nov 26 11:53:33 1997 Keith Seitz <keiths@onions.cygnus.com>
|
||||
|
||||
* Makefile.in, configure, configure.in: merge with foundry-971118-build
|
||||
|
||||
Mon Nov 10 15:23:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu>
|
||||
|
||||
* ltmain.sh: If mkdir fails, check whether the directory was created
|
||||
anyhow by some other process.
|
||||
|
||||
start-sanitize-d30v
|
||||
Mon Nov 10 14:38:03 1997 Michael Meissner <meissner@cygnus.com>
|
||||
|
||||
|
|
@ -13,12 +22,13 @@ Sat Nov 8 14:42:59 1997 Michael Meissner <meissner@cygnus.com>
|
|||
* configure.in (d30v-*-*): Configure target-libgloss on the D30V.
|
||||
|
||||
end-sanitize-d30v
|
||||
|
||||
Fri Nov 7 10:34:09 1997 Rob Savoye <rob@darkstar.cygnus.com>
|
||||
|
||||
* include/libiberty.h: Add extern "C" { so it can be used with C++
|
||||
progrms.
|
||||
* include/remote-sim.h: Add extern "C" { so it can be used with C++
|
||||
programs.
|
||||
* include/libiberty.h: Add extern "C" { so it can be used with C++
|
||||
progrms.
|
||||
* include/remote-sim.h: Add extern "C" { so it can be used with C++
|
||||
programs.
|
||||
|
||||
start-sanitize-tx19
|
||||
Wed Nov 5 11:14:44 1997 Gavin Koch <gavin@cygnus.com>
|
||||
|
|
@ -46,6 +56,13 @@ Wed Oct 29 16:52:43 1997 Gavin Koch <gavin@cygnus.com>
|
|||
* config.sub: Add tx49 configury.
|
||||
|
||||
end-sanitize-tx49
|
||||
|
||||
start-sanitize-ide
|
||||
Tue Oct 28 16:44:15 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* Makefile.in (install-foundry): New target.
|
||||
end-sanitize-ide
|
||||
|
||||
Mon Oct 27 13:17:24 1997 Stan Shebs <shebs@andros.cygnus.com>
|
||||
|
||||
* configure.in: Remove a "second pass" of tweaking noconfigdirs,
|
||||
|
|
@ -65,6 +82,13 @@ Mon Oct 20 15:28:49 1997 Klaus K"ampf <kkaempf@progis.de>
|
|||
|
||||
* makefile.vms: Fix to work with DEC C.
|
||||
|
||||
start-sanitize-ide
|
||||
Sat Oct 11 13:52:40 1997 Tom Tromey <tromey@cygnus.com>
|
||||
|
||||
* Makefile.in (all-jstools): Depend on all-tix.
|
||||
|
||||
end-sanitize-ide
|
||||
|
||||
Tue Oct 7 23:58:57 1997 Gavin Koch <gavin@cygnus.com>
|
||||
|
||||
* config.sub: Add mips-tx39-elf to marketing names.
|
||||
|
|
@ -138,6 +162,10 @@ Fri Sep 5 16:11:28 1997 Joel Sherrill (joel@OARcorp.com)
|
|||
|
||||
* configure.in (*-*-rtems*): Do not build libgloss for rtems.
|
||||
|
||||
Wed Sep 3 19:38:01 1997 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* Makefile.in (GDB_TK): Add all-libide.
|
||||
|
||||
Wed Sep 3 12:15:24 1997 Chris Provenzano <proven@cygnus.com>
|
||||
|
||||
* ltconfig: Set CONFIG_SHELL in libtool.
|
||||
|
|
@ -198,6 +226,12 @@ Thu Aug 14 14:42:17 1997 Ian Lance Taylor <ian@cygnus.com>
|
|||
|
||||
* configure: When handling a Canadian Cross, handle YACC as well as
|
||||
BISON. Just set BISON to bison. When setting YACC, prefer bison.
|
||||
* Makefile.in (all-bison): Depend upon all-texinfo.
|
||||
|
||||
start-sanitize-ide
|
||||
* Makefile.in (all-vmake): Depend upon all-tix.
|
||||
|
||||
end-sanitize-ide
|
||||
|
||||
Tue Aug 12 20:09:48 1997 Jason Merrill <jason@yorick.cygnus.com>
|
||||
|
||||
|
|
|
|||
64
Makefile.in
64
Makefile.in
|
|
@ -20,16 +20,25 @@
|
|||
srcdir = .
|
||||
|
||||
prefix = /usr/local
|
||||
|
||||
exec_prefix = $(prefix)
|
||||
bindir = $(exec_prefix)/bin
|
||||
libdir = $(exec_prefix)/lib
|
||||
|
||||
bindir=${exec_prefix}/bin
|
||||
sbindir=${exec_prefix}/sbin
|
||||
libexecdir=${exec_prefix}/libexec
|
||||
datadir=${prefix}/share
|
||||
sysconfdir=${prefix}/etc
|
||||
sharedstatedir=${prefix}/com
|
||||
localstatedir=${prefix}/var
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
oldincludedir=/usr/include
|
||||
infodir=${prefix}/info
|
||||
mandir=${prefix}/man
|
||||
|
||||
tooldir = $(exec_prefix)/$(target)
|
||||
|
||||
program_transform_name =
|
||||
|
||||
datadir = $(prefix)/share
|
||||
mandir = $(prefix)/man
|
||||
man1dir = $(mandir)/man1
|
||||
man2dir = $(mandir)/man2
|
||||
man3dir = $(mandir)/man3
|
||||
|
|
@ -39,8 +48,6 @@ man6dir = $(mandir)/man6
|
|||
man7dir = $(mandir)/man7
|
||||
man8dir = $(mandir)/man8
|
||||
man9dir = $(mandir)/man9
|
||||
infodir = $(prefix)/info
|
||||
includedir = $(prefix)/include
|
||||
GDB_NLM_DEPS =
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
|
@ -369,9 +376,21 @@ BASE_FLAGS_TO_PASS = \
|
|||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
|
||||
"YACC=$(YACC)" \
|
||||
"bindir=$(bindir)" \
|
||||
"datadir=$(datadir)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"includedir=$(includedir)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"libexecdir=$(libexecdir)" \
|
||||
"localstatedir=$(localstatedir)" \
|
||||
"mandir=$(mandir)" \
|
||||
"oldincludedir=$(oldincludedir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"tooldir=$(tooldir)"
|
||||
"sbindir=$(sbindir)" \
|
||||
"sharedstatedir=$(sharedstatedir)" \
|
||||
"sysconfdir=$(sysconfdir)" \
|
||||
"tooldir=$(tooldir)"
|
||||
|
||||
# Flags to pass down to most sub-makes, in which we're building with
|
||||
# the host environment.
|
||||
|
|
@ -1085,6 +1104,28 @@ gcc-no-fixedincludes:
|
|||
mv gcc/tmp-include gcc/include 2>/dev/null; \
|
||||
else true; fi
|
||||
|
||||
# start-sanitize-ide
|
||||
# Install Foundry. Avoid installing a bunch of stuff we don't need.
|
||||
install-foundry:
|
||||
mods="$(INSTALL_MODULES)"; \
|
||||
x11_mods="$(INSTALL_X11_MODULES)"; \
|
||||
for d in install-tcl install-tk install-itcl install-tix install-ilu; do \
|
||||
mods="`echo $${mods} | sed -e "s/$$d//"`"; \
|
||||
x11_mods="`echo $${x11_mods} | sed -e "s/$$d//"`"; \
|
||||
done; \
|
||||
$(MAKE) INSTALL_MODULES="$${mods}" INSTALL_X11_MODULES="$${x11_mods}" install
|
||||
for d in tcl tk itcl tix ilu; do \
|
||||
if [ -f $$d/Makefile ]; then \
|
||||
r=`pwd`; export r; \
|
||||
s=`cd $(srcdir); pwd`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd $$d; $(MAKE) $(FLAGS_TO_PASS) install-minimal); \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
done
|
||||
# end-sanitize-ide
|
||||
|
||||
# This rule is used to build the modules which use FLAGS_TO_PASS. To
|
||||
# build a target all-X means to cd to X and make all.
|
||||
#
|
||||
|
|
@ -1424,7 +1465,7 @@ all-gawk:
|
|||
ALL_GCC = all-gcc
|
||||
all-gcc: all-bison all-byacc all-binutils all-gas all-ld
|
||||
all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
|
||||
GDB_TK = all-tk all-tcl all-itcl all-tix
|
||||
GDB_TK = all-tk all-tcl all-itcl all-tix all-libide
|
||||
all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
|
||||
all-gnuserv:
|
||||
configure-target-gperf: $(ALL_GCC)
|
||||
|
|
@ -1444,7 +1485,7 @@ all-inet: all-tcl all-send-pr all-perl
|
|||
all-ispell: all-emacs19
|
||||
all-itcl: all-tcl all-tk
|
||||
# start-sanitize-ide
|
||||
all-jstools: all-tcl all-tk all-libide
|
||||
all-jstools: all-tcl all-tk all-tix all-libide
|
||||
# end-sanitize-ide
|
||||
all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex
|
||||
configure-target-libg++: $(ALL_GCC) configure-target-librx
|
||||
|
|
@ -1453,6 +1494,7 @@ configure-target-libgloss: $(ALL_GCC)
|
|||
all-target-libgloss: configure-target-libgloss configure-target-newlib
|
||||
configure-target-libio: $(ALL_GCC)
|
||||
all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
|
||||
check-target-libio: all-target-libstdc++
|
||||
all-libiberty:
|
||||
# start-sanitize-ide
|
||||
all-libide: all-tcl all-tk all-itcl all-ilu
|
||||
|
|
@ -1488,7 +1530,7 @@ all-tgas: all-libiberty all-bfd all-opcodes
|
|||
all-time:
|
||||
all-tix: all-tcl all-tk
|
||||
# start-sanitize-ide
|
||||
all-vmake: all-tcl all-tk all-itcl all-libide all-tix
|
||||
all-vmake: all-tcl all-tk all-itcl all-libide all-tix all-libide
|
||||
# end-sanitize-ide
|
||||
all-wdiff:
|
||||
all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ build_alias=
|
|||
cache_file=config.cache
|
||||
cache_file_option=
|
||||
configdirs=
|
||||
diroptions=
|
||||
exec_prefix=
|
||||
exec_prefixoption=
|
||||
fatal=
|
||||
|
|
@ -83,6 +84,18 @@ target_makefile_frag=
|
|||
undefs=NOUNDEFS
|
||||
version="$Revision$"
|
||||
x11=default
|
||||
bindir='${exec_prefix}/bin'
|
||||
sbindir='${exec_prefix}/sbin'
|
||||
libexecdir='${exec_prefix}/libexec'
|
||||
datadir='${prefix}/share'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
libdir='${exec_prefix}/lib'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
infodir='${prefix}/info'
|
||||
mandir='${prefix}/man'
|
||||
|
||||
### we might need to use some other shell than /bin/sh for running subshells
|
||||
|
||||
|
|
@ -189,6 +202,10 @@ do
|
|||
# Now, process the options
|
||||
case $option in
|
||||
|
||||
--bi*)
|
||||
bindir=$optarg
|
||||
diroptions="$diroptions --bindir=$optarg"
|
||||
;;
|
||||
--build* | --bu*)
|
||||
case "$build_alias" in
|
||||
"") build_alias=$optarg ;;
|
||||
|
|
@ -200,6 +217,10 @@ do
|
|||
--cache*)
|
||||
cache_file=$optarg
|
||||
;;
|
||||
--da*)
|
||||
datadir=$optarg
|
||||
diroptions="$diroptions --datadir=$optarg"
|
||||
;;
|
||||
--disable-*)
|
||||
enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
|
||||
eval $enableopt=no
|
||||
|
|
@ -233,6 +254,30 @@ do
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
--inc*)
|
||||
includedir=$optarg
|
||||
diroptions="$diroptions --includedir=$optarg"
|
||||
;;
|
||||
--inf*)
|
||||
infodir=$optarg
|
||||
diroptions="$diroptions --infodir=$optarg"
|
||||
;;
|
||||
--libd*)
|
||||
libdir=$optarg
|
||||
diroptions="$diroptions --libdir=$optarg"
|
||||
;;
|
||||
--libe*)
|
||||
libexecdir=$optarg
|
||||
diroptions="$diroptions --libexecdir=$optarg"
|
||||
;;
|
||||
--lo*)
|
||||
localstatedir=$optarg
|
||||
diroptions="$diroptions --localstatedir=$optarg"
|
||||
;;
|
||||
--ma*)
|
||||
mandir=$optarg
|
||||
diroptions="$diroptions --mandir=$optarg"
|
||||
;;
|
||||
--nfp | --nf*)
|
||||
floating_point=no
|
||||
floating_pointoption="--nfp"
|
||||
|
|
@ -240,6 +285,10 @@ do
|
|||
--norecursion | --no*)
|
||||
norecursion=yes
|
||||
;;
|
||||
--ol*)
|
||||
oldincludedir=$optarg
|
||||
diroptions="$diroptions --oldincludedir=$optarg"
|
||||
;;
|
||||
--prefix* | --pre*)
|
||||
prefix=$optarg
|
||||
prefixoption="--prefix=$optarg"
|
||||
|
|
@ -260,6 +309,14 @@ do
|
|||
--rm)
|
||||
removing=--rm
|
||||
;;
|
||||
--sb*)
|
||||
sbindir=$optarg
|
||||
diroptions="$diroptions --sbindir=$optarg"
|
||||
;;
|
||||
--sh*)
|
||||
sharedstatedir=$optarg
|
||||
diroptions="$diroptions --sharedstatedir=$optarg"
|
||||
;;
|
||||
--silent | --sil* | --quiet | --q*)
|
||||
redirect=">/dev/null"
|
||||
verbose=--silent
|
||||
|
|
@ -278,6 +335,10 @@ do
|
|||
--srcdir* | --sr*)
|
||||
srcdir=$optarg
|
||||
;;
|
||||
--sy*)
|
||||
sysconfdir=$optarg
|
||||
diroptions="$diroptions --sysconfdir=$optarg"
|
||||
;;
|
||||
--target* | --ta*)
|
||||
case $target_alias in
|
||||
NOTARGET) target_alias=$optarg ;;
|
||||
|
|
@ -318,9 +379,6 @@ do
|
|||
;;
|
||||
--x-i* | --x-l*) other_options="$other_options $orig_option"
|
||||
;;
|
||||
--bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
|
||||
# These options were added to autoconf for emacs.
|
||||
;;
|
||||
--*)
|
||||
echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
|
||||
exit 1
|
||||
|
|
@ -540,7 +598,7 @@ case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
|
|||
eval exec ${config_shell} ${srcdir}/configure ${verbose} \
|
||||
${buildopt} --host=${host_alias} --target=${target_alias} \
|
||||
${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
|
||||
${srcdiroption} \
|
||||
${srcdiroption} ${diroptions} \
|
||||
${program_prefixoption} ${program_suffixoption} \
|
||||
${program_transform_nameoption} ${site_option} \
|
||||
${withoptions} ${withoutoptions} \
|
||||
|
|
@ -1183,6 +1241,18 @@ EOF
|
|||
fi
|
||||
sed -e "s|^prefix[ ]*=.*$|prefix = ${prefix}|" \
|
||||
-e "s|^exec_prefix[ ]*=.*$|exec_prefix = ${exec_prefix}|" \
|
||||
-e "s|^bindir[ ]*=.*$|bindir = ${bindir}|" \
|
||||
-e "s|^sbindir[ ]*=.*$|sbindir = ${sbindir}|" \
|
||||
-e "s|^libexecdir[ ]*=.*$|libexecdir = ${libexecdir}|" \
|
||||
-e "s|^datadir[ ]*=.*$|datadir = ${datadir}|" \
|
||||
-e "s|^sysconfdir[ ]*=.*$|sysconfdir = ${sysconfdir}|" \
|
||||
-e "s|^sharedstatedir[ ]*=.*$|sharedstatedir = ${sharedstatedir}|" \
|
||||
-e "s|^localstatedir[ ]*=.*$|localstatedir = ${localstatedir}|" \
|
||||
-e "s|^libdir[ ]*=.*$|libdir = ${libdir}|" \
|
||||
-e "s|^includedir[ ]*=.*$|includedir = ${includedir}|" \
|
||||
-e "s|^oldincludedir[ ]*=.*$|oldincludedir = ${oldincludedir}|" \
|
||||
-e "s|^infodir[ ]*=.*$|infodir = ${infodir}|" \
|
||||
-e "s|^mandir[ ]*=.*$|mandir = ${mandir}|" \
|
||||
-e "/^CC[ ]*=/{
|
||||
:loop1
|
||||
/\\\\$/ N
|
||||
|
|
@ -1376,7 +1446,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
|
|||
if [ ! -z "${recprog}" ] ; then
|
||||
if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
|
||||
${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
|
||||
${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
|
||||
${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
|
||||
true
|
||||
else
|
||||
echo Configure in `pwd` failed, exiting. 1>&2
|
||||
|
|
|
|||
Loading…
Reference in New Issue