Commit 61b56b2e by Keith R Seitz Committed by DJ Delorie

Makefile.def: Remove "snavigator", "grep", and "db" modules.

* Makefile.def: Remove "snavigator", "grep", and "db" modules.
* Makefile.tpl: Remove "all-snavigator" and "all-grep".
* Makefile.in: Regenerated.
* configure.in: Remove all traces of snavigator, db, and grep.
* configure: Regenerated.

From-SVN: r62496
parent d1164330
2003-02-06 Keith R Seitz <keiths@redhat.com>
* Makefile.def: Remove "snavigator", "grep", and "db" modules.
* Makefile.tpl: Remove "all-snavigator" and "all-grep".
* Makefile.in: Regenerated.
* configure.in: Remove all traces of snavigator, db, and grep.
* configure: Regenerated.
2003-02-06 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
* MAINTAINERS: Remove duplicate entry for Bernd Schmidt from Write
......
......@@ -13,7 +13,6 @@ 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; };
......@@ -28,7 +27,6 @@ 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; };
......@@ -54,7 +52,6 @@ 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; };
......
......@@ -3,7 +3,7 @@
#
# Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
# 1999, 2000, 2001, 2002 Free Software Foundation
# 1999, 2000, 2001, 2002, 2003 Free Software Foundation
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -543,7 +543,6 @@ CLEAN_MODULES = \
clean-bison \
clean-byacc \
clean-bzip2 \
clean-db \
clean-dejagnu \
clean-diff \
clean-dosutils \
......@@ -558,7 +557,6 @@ CLEAN_MODULES = \
clean-gettext \
clean-gnuserv \
clean-gprof \
clean-grep \
clean-gzip \
clean-hello \
clean-indent \
......@@ -584,7 +582,6 @@ CLEAN_MODULES = \
clean-shellutils \
clean-sid \
clean-sim \
clean-snavigator \
clean-tar \
clean-texinfo \
clean-textutils \
......@@ -1984,73 +1981,6 @@ install-bzip2: installdirs
(cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-db maybe-configure-db
maybe-configure-db:
configure-db:
@test ! -f db/Makefile || exit 0; \
[ -d db ] || mkdir db; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
AR="$(AR)"; export AR; \
AS="$(AS)"; export AS; \
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
LD="$(LD)"; export LD; \
NM="$(NM)"; export NM; \
RANLIB="$(RANLIB)"; export RANLIB; \
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
fi; \
echo Configuring in db; \
cd db || exit 1; \
case $(srcdir) in \
\.) \
srcdiroption="--srcdir=."; \
libsrcdir=".";; \
/* | [A-Za-z]:[\\/]*) \
srcdiroption="--srcdir=$(srcdir)/db"; \
libsrcdir="$$s/db";; \
*) \
srcdiroption="--srcdir=../$(srcdir)/db"; \
libsrcdir="$$s/db";; \
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1
.PHONY: all-db maybe-all-db
maybe-all-db:
all-db: configure-db
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd db && $(MAKE) $(FLAGS_TO_PASS) all)
.PHONY: check-db
check-db:
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd db && $(MAKE) $(FLAGS_TO_PASS) check)
.PHONY: install-db maybe-install-db
maybe-install-db:
install-db: installdirs
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd db && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-dejagnu maybe-configure-dejagnu
maybe-configure-dejagnu:
configure-dejagnu:
......@@ -2991,73 +2921,6 @@ install-gprof: installdirs
(cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-grep maybe-configure-grep
maybe-configure-grep:
configure-grep:
@test ! -f grep/Makefile || exit 0; \
[ -d grep ] || mkdir grep; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
AR="$(AR)"; export AR; \
AS="$(AS)"; export AS; \
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
LD="$(LD)"; export LD; \
NM="$(NM)"; export NM; \
RANLIB="$(RANLIB)"; export RANLIB; \
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
fi; \
echo Configuring in grep; \
cd grep || exit 1; \
case $(srcdir) in \
\.) \
srcdiroption="--srcdir=."; \
libsrcdir=".";; \
/* | [A-Za-z]:[\\/]*) \
srcdiroption="--srcdir=$(srcdir)/grep"; \
libsrcdir="$$s/grep";; \
*) \
srcdiroption="--srcdir=../$(srcdir)/grep"; \
libsrcdir="$$s/grep";; \
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1
.PHONY: all-grep maybe-all-grep
maybe-all-grep:
all-grep: configure-grep
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd grep && $(MAKE) $(FLAGS_TO_PASS) all)
.PHONY: check-grep
check-grep:
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd grep && $(MAKE) $(FLAGS_TO_PASS) check)
.PHONY: install-grep maybe-install-grep
maybe-install-grep:
install-grep: installdirs
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd grep && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-gzip maybe-configure-gzip
maybe-configure-gzip:
configure-gzip:
......@@ -4721,73 +4584,6 @@ install-sim: installdirs
(cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-snavigator maybe-configure-snavigator
maybe-configure-snavigator:
configure-snavigator:
@test ! -f snavigator/Makefile || exit 0; \
[ -d snavigator ] || mkdir snavigator; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
AR="$(AR)"; export AR; \
AS="$(AS)"; export AS; \
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
LD="$(LD)"; export LD; \
NM="$(NM)"; export NM; \
RANLIB="$(RANLIB)"; export RANLIB; \
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
fi; \
echo Configuring in snavigator; \
cd snavigator || exit 1; \
case $(srcdir) in \
\.) \
srcdiroption="--srcdir=."; \
libsrcdir=".";; \
/* | [A-Za-z]:[\\/]*) \
srcdiroption="--srcdir=$(srcdir)/snavigator"; \
libsrcdir="$$s/snavigator";; \
*) \
srcdiroption="--srcdir=../$(srcdir)/snavigator"; \
libsrcdir="$$s/snavigator";; \
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1
.PHONY: all-snavigator maybe-all-snavigator
maybe-all-snavigator:
all-snavigator: configure-snavigator
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd snavigator && $(MAKE) $(FLAGS_TO_PASS) all)
.PHONY: check-snavigator
check-snavigator:
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd snavigator && $(MAKE) $(FLAGS_TO_PASS) check)
.PHONY: install-snavigator maybe-install-snavigator
maybe-install-snavigator:
install-snavigator: installdirs
@r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd snavigator && $(MAKE) $(FLAGS_TO_PASS) install)
.PHONY: configure-tar maybe-configure-tar
maybe-configure-tar:
configure-tar:
......@@ -7599,7 +7395,6 @@ all-diff: maybe-all-libiberty
all-fastjar: maybe-all-zlib maybe-all-libiberty
all-fileutils: maybe-all-libiberty
all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
all-grep: maybe-all-libiberty
all-gzip: maybe-all-libiberty
all-hello: maybe-all-libiberty
all-m4: maybe-all-libiberty maybe-all-texinfo
......@@ -7609,7 +7404,6 @@ all-prms: maybe-all-libiberty
all-recode: maybe-all-libiberty
all-sed: maybe-all-libiberty
all-send-pr: maybe-all-prms
all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
all-tar: maybe-all-libiberty
all-uudecode: maybe-all-libiberty
......
......@@ -6,7 +6,7 @@ in
#
# Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
# 1999, 2000, 2001, 2002 Free Software Foundation
# 1999, 2000, 2001, 2002, 2003 Free Software Foundation
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -1335,7 +1335,6 @@ all-diff: maybe-all-libiberty
all-fastjar: maybe-all-zlib maybe-all-libiberty
all-fileutils: maybe-all-libiberty
all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
all-grep: maybe-all-libiberty
all-gzip: maybe-all-libiberty
all-hello: maybe-all-libiberty
all-m4: maybe-all-libiberty maybe-all-texinfo
......@@ -1345,7 +1344,6 @@ all-prms: maybe-all-libiberty
all-recode: maybe-all-libiberty
all-sed: maybe-all-libiberty
all-send-pr: maybe-all-prms
all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
all-tar: maybe-all-libiberty
all-uudecode: maybe-all-libiberty
......
......@@ -135,7 +135,7 @@ fi
# these libraries are used by various programs built for the host environment
#
host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk itcl tix libgui zlib"
host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl tix libgui zlib"
libstdcxx_version="target-libstdc++-v3"
......@@ -144,7 +144,7 @@ libstdcxx_version="target-libstdc++-v3"
# know that we are building the simulator.
# binutils, gas and ld appear in that order because it makes sense to run
# "make check" in that particular order.
host_tools="texinfo byacc flex bison binutils gas ld gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool grep diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils snavigator gettext zip fastjar"
host_tools="texinfo byacc flex bison binutils gas ld gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar"
# libgcj represents the runtime libraries only used by gcj.
libgcj="target-libffi \
......@@ -258,7 +258,7 @@ esac
# Some tools are only suitable for building in a "native" situation.
# 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"
native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf"
# Similarly, some are only suitable for cross toolchains.
# Remove these if host=target.
......@@ -299,13 +299,13 @@ case "${host}" in
noconfigdirs="$noconfigdirs byacc"
;;
i[[3456]]86-*-vsta)
noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix db snavigator gnuserv gettext"
noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnuserv gettext"
;;
i[[3456]]86-*-go32* | i[[3456]]86-*-msdosdjgpp*)
noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile itcl tix db snavigator gnuserv libffi"
noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile itcl tix gnuserv libffi"
;;
i[[3456]]86-*-mingw32*)
# noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix db snavigator gnuserv"
# noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv"
noconfigdirs="expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
;;
i[[3456]]86-*-beos*)
......@@ -318,7 +318,7 @@ case "${host}" in
noconfigdirs="rcs"
;;
ppc*-*-pe)
noconfigdirs="patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix db snavigator gnuserv"
noconfigdirs="patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv"
;;
powerpc-*-beos*)
noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline"
......@@ -535,7 +535,7 @@ case "${target}" in
# Can't build gdb for mingw32 if not native.
case "${host}" in
i[[3456]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
*) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db snavigator gnuserv"
*) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix gnuserv"
;;
esac
;;
......@@ -548,7 +548,7 @@ case "${target}" in
# Can't build gdb for Cygwin if not native.
case "${host}" in
*-*-cygwin*) ;; # keep gdb tcl tk expect etc.
*) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix libgui db snavigator gnuserv"
*) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix libgui gnuserv"
;;
esac
;;
......@@ -601,13 +601,13 @@ case "${target}" in
;;
powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
target_configdirs="$target_configdirs target-winsup"
noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv ${libgcj}"
noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix gnuserv ${libgcj}"
# always build newlib.
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
;;
# This is temporary until we can link against shared libraries
powerpcle-*-solaris*)
noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv ${libgcj}"
noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix gnuserv ${libgcj}"
;;
powerpc-*-beos*)
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment