Wipe out apache.

Wipe out apache.  Don't configure cgen from the top level; that part is
simply pulled over from src.

From-SVN: r55159
This commit is contained in:
Nathanael Nerode 2002-07-01 22:40:12 +00:00
parent e20569ae80
commit 3ab36f05d6
3 changed files with 24 additions and 20 deletions

View File

@ -1,3 +1,17 @@
2002-06-24 Ben Elliston <bje@redhat.com>
* configure.in (host_tools): Remove cgen.
* Makefile.in (all-cgen): Remove; runs from its source directory.
(check-cgen, install-cgen, clean-cgen): Likewise.
(all-opcodes): No not depend on all-cgen.
(all-sim): Likewise.
2002-07-01 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in: Eliminate 'apache' targets.
* configure.in: Eliminate 'apache' targets.
2002-07-01 Nathanael Nerode <neroden@gcc.gnu.org> 2002-07-01 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Eliminate redundant tests. Reorganize. * configure.in: Eliminate redundant tests. Reorganize.

View File

@ -524,7 +524,6 @@ CONFIGURE_BUILD_MODULES = \
# This is a list of the targets for all of the modules which are compiled # This is a list of the targets for all of the modules which are compiled
# using $(FLAGS_TO_PASS). # using $(FLAGS_TO_PASS).
ALL_MODULES = \ ALL_MODULES = \
all-apache \
all-ash \ all-ash \
all-autoconf \ all-autoconf \
all-automake \ all-automake \
@ -534,7 +533,6 @@ ALL_MODULES = \
all-bison \ all-bison \
all-byacc \ all-byacc \
all-bzip2 \ all-bzip2 \
all-cgen \
all-cvssrc \ all-cvssrc \
all-db \ all-db \
all-dejagnu \ all-dejagnu \
@ -607,7 +605,6 @@ NATIVE_CHECK_MODULES = \
check-zip check-zip
CROSS_CHECK_MODULES = \ CROSS_CHECK_MODULES = \
check-apache \
check-ash \ check-ash \
check-autoconf \ check-autoconf \
check-automake \ check-automake \
@ -615,7 +612,6 @@ CROSS_CHECK_MODULES = \
check-bfd \ check-bfd \
check-binutils \ check-binutils \
check-bzip2 \ check-bzip2 \
check-cgen \
check-cvssrc \ check-cvssrc \
check-db \ check-db \
check-dejagnu \ check-dejagnu \
@ -677,7 +673,6 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
# We put install-tcl before install-itcl because itcl wants to run a # We put install-tcl before install-itcl because itcl wants to run a
# program on installation which uses the Tcl libraries. # program on installation which uses the Tcl libraries.
INSTALL_MODULES = \ INSTALL_MODULES = \
install-apache \
install-ash \ install-ash \
install-autoconf \ install-autoconf \
install-automake \ install-automake \
@ -688,7 +683,6 @@ INSTALL_MODULES = \
install-binutils \ install-binutils \
install-bison \ install-bison \
install-byacc \ install-byacc \
install-cgen \
install-cvssrc \ install-cvssrc \
install-db \ install-db \
install-dejagnu \ install-dejagnu \
@ -853,7 +847,6 @@ INSTALL_TARGET_MODULES = \
# This is a list of the targets for which we can do a clean-{target}. # This is a list of the targets for which we can do a clean-{target}.
CLEAN_MODULES = \ CLEAN_MODULES = \
clean-apache \
clean-ash \ clean-ash \
clean-autoconf \ clean-autoconf \
clean-automake \ clean-automake \
@ -863,7 +856,6 @@ CLEAN_MODULES = \
clean-bison \ clean-bison \
clean-byacc \ clean-byacc \
clean-bzip2 \ clean-bzip2 \
clean-cgen \
clean-cvssrc \ clean-cvssrc \
clean-db \ clean-db \
clean-dejagnu \ clean-dejagnu \
@ -1692,7 +1684,6 @@ ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3 ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
# This is a list of inter-dependencies among modules. # This is a list of inter-dependencies among modules.
all-apache:
all-ash: all-ash:
all-autoconf: all-m4 all-texinfo all-autoconf: all-m4 all-texinfo
all-automake: all-m4 all-texinfo all-automake: all-m4 all-texinfo
@ -1706,7 +1697,6 @@ configure-target-bsp: $(ALL_GCC_C)
all-target-bsp: configure-target-bsp all-target-bsp: configure-target-bsp
all-byacc: all-byacc:
all-bzip2: all-bzip2:
all-cgen: all-libiberty
all-cvssrc: all-cvssrc:
configure-target-cygmon: $(ALL_GCC_C) configure-target-cygmon: $(ALL_GCC_C)
all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libstub all-target-bsp all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libstub all-target-bsp
@ -1770,7 +1760,7 @@ configure-target-newlib: $(ALL_GCC)
all-target-newlib: configure-target-newlib all-target-newlib: configure-target-newlib
configure-target-libtermcap: $(ALL_GCC_C) configure-target-libtermcap: $(ALL_GCC_C)
all-target-libtermcap: configure-target-libtermcap all-target-libtermcap: configure-target-libtermcap
all-opcodes: all-bfd all-libiberty all-cgen all-opcodes: all-bfd all-libiberty
all-patch: all-libiberty all-patch: all-libiberty
all-perl: all-perl:
all-prms: all-libiberty all-prms: all-libiberty
@ -1783,7 +1773,7 @@ all-sed: all-libiberty
all-send-pr: all-prms all-send-pr: all-prms
all-shellutils: all-shellutils:
all-sid: all-tcl all-tk all-sid: all-tcl all-tk
all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen all-sim: all-libiberty all-bfd all-opcodes all-readline
all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
all-tar: all-libiberty all-tar: all-libiberty
all-tcl: all-tcl:

View File

@ -49,7 +49,7 @@ libstdcxx_version="target-libstdc++-v3"
# these tools are built for the host environment # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
# know that we are building the simulator. # know that we are building the simulator.
host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar" host_tools="texinfo byacc flex bison binutils ld gas gcc sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl inet gawk findutils snavigator libtool gettext zip fastjar"
# libgcj represents the runtime libraries only used by gcj. # libgcj represents the runtime libraries only used by gcj.
libgcj="target-libffi \ libgcj="target-libffi \
@ -90,7 +90,7 @@ target_tools="target-examples target-groff target-gperf"
# #
# This must be a single line because of the way it is searched by grep in # This must be a single line because of the way it is searched by grep in
# the code below. # the code below.
native_only="autoconf automake libtool cvssrc fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf" native_only="autoconf automake libtool cvssrc fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
# directories to be built in a cross environment only # directories to be built in a cross environment only
# #
@ -222,26 +222,26 @@ case "${host}" in
noconfigdirs="$noconfigdirs byacc" noconfigdirs="$noconfigdirs byacc"
;; ;;
i[3456]86-*-vsta) i[3456]86-*-vsta)
noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext" noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl inet itcl tix db snavigator gnuserv gettext"
;; ;;
i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*) i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile apache inet itcl tix db snavigator gnuserv libffi" noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile inet itcl tix db snavigator gnuserv libffi"
;; ;;
i[3456]86-*-mingw32*) i[3456]86-*-mingw32*)
# noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv" # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl inet itcl tix db snavigator gnuserv"
noconfigdirs="expect dejagnu cvs autoconf automake send-pr rcs guile perl texinfo apache inet libtool" noconfigdirs="expect dejagnu cvs autoconf automake send-pr rcs guile perl texinfo inet libtool"
;; ;;
i[3456]86-*-beos*) i[3456]86-*-beos*)
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb" noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
;; ;;
*-*-cygwin*) *-*-cygwin*)
noconfigdirs="autoconf automake send-pr rcs guile perl apache inet" noconfigdirs="autoconf automake send-pr rcs guile perl inet"
;; ;;
*-*-netbsd*) *-*-netbsd*)
noconfigdirs="rcs" noconfigdirs="rcs"
;; ;;
ppc*-*-pe) ppc*-*-pe)
noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl apache inet itcl tix db snavigator gnuserv" noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl inet itcl tix db snavigator gnuserv"
;; ;;
powerpc-*-beos*) powerpc-*-beos*)
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline" noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline"