From 6f1e21508b50e5316956786c1c67944f78431adf Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 16 Dec 1997 15:45:28 +0000 Subject: [PATCH] sanitize out libide unless keep-ide --- .Sanitize | 6 +++--- ChangeLog | 12 +++++------- configure | 3 +++ configure.in | 23 +++++++++++++---------- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.Sanitize b/.Sanitize index dae079f..2ca0325 100644 --- a/.Sanitize +++ b/.Sanitize @@ -53,7 +53,7 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff guile gzip include inet install-sh ispell - ld less libg++ libgcc libgloss libiberty libgui libide libio + ld less libg++ libgcc libgloss libiberty libio librx libstdc++ m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes pagas patch perl prms @@ -73,7 +73,7 @@ else lose_these_too="${lose_these_too} ${cygnus_files}" fi -gdbtk_files="tcl tk itcl tix" +gdbtk_files="tcl tk itcl tix libgui" if ( echo $* | grep lose\-gdbtk > /dev/null) ; then lose_these_too="${lose_these_too} ${gdbtk_files}" @@ -108,7 +108,7 @@ else keep_these_too="${keep_these_too} ${inet_files}" fi -ide_files="vmake" +ide_files="libide vmake jstools" if (echo $* | grep keep\-ide > /dev/null); then keep_these_too="${keep_these_too} ${ide_files}" diff --git a/ChangeLog b/ChangeLog index 97f6399..a5de36e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ Tue Dec 2 10:08:31 1997 Nick Clifton * config.sub (maybe_os): Add support for Thumb target. +start-sanitize-ide Tue Dec 2 06:51:40 1997 Keith Seitz * configure (GDB_TK): add all-libide to dependency list @@ -45,8 +46,7 @@ Mon Dec 1 10:53:40 1997 Keith Seitz * Makefile.in (all-vmake): remove double dependency on all-libide - * modules/modules: add libide to gdb's checkout list - +end-sanitize-ide Sun Nov 30 16:12:27 1997 Bob Manson * Makefile.in: Add rules for cygmon. @@ -78,7 +78,6 @@ Sat Nov 8 14:42:59 1997 Michael Meissner * configure.in (d30v-*-*): Configure target-libgloss on the D30V. end-sanitize-d30v - Fri Nov 7 10:34:09 1997 Rob Savoye * include/libiberty.h: Add extern "C" { so it can be used with C++ @@ -112,13 +111,12 @@ Wed Oct 29 16:52:43 1997 Gavin Koch * config.sub: Add tx49 configury. end-sanitize-tx49 - start-sanitize-ide Tue Oct 28 16:44:15 1997 Ian Lance Taylor * Makefile.in (install-foundry): New target. + end-sanitize-ide - Mon Oct 27 13:17:24 1997 Stan Shebs * configure.in: Remove a "second pass" of tweaking noconfigdirs, @@ -144,7 +142,6 @@ Sat Oct 11 13:52:40 1997 Tom Tromey * Makefile.in (all-jstools): Depend on all-tix. end-sanitize-ide - Tue Oct 7 23:58:57 1997 Gavin Koch * config.sub: Add mips-tx39-elf to marketing names. @@ -218,10 +215,12 @@ Fri Sep 5 16:11:28 1997 Joel Sherrill (joel@OARcorp.com) * configure.in (*-*-rtems*): Do not build libgloss for rtems. +start-sanitize-ide Wed Sep 3 19:38:01 1997 Ian Lance Taylor * Makefile.in (GDB_TK): Add all-libide. +end-sanitize-ide Wed Sep 3 12:15:24 1997 Chris Provenzano * ltconfig: Set CONFIG_SHELL in libtool. @@ -286,7 +285,6 @@ start-sanitize-ide * Makefile.in (all-vmake): Depend upon all-tix. end-sanitize-ide - Tue Aug 12 20:09:48 1997 Jason Merrill * Makefile.in (BISON): bison, not byacc or bison -y. diff --git a/configure b/configure index 1cd031d..eb61b64 100755 --- a/configure +++ b/configure @@ -988,7 +988,10 @@ esac # FIXME: This should be in configure.in, not configure # Determine whether gdb needs tk/tcl or not. if [ "$enable_gdbtk" != "no" ]; then + GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" + # start-sanitize-ide GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui all-libide" + # end-sanitize-ide else GDB_TK="" fi diff --git a/configure.in b/configure.in index 9621f3d..9e81be4 100644 --- a/configure.in +++ b/configure.in @@ -41,7 +41,10 @@ # these libraries are used by various programs built for the host environment # -host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libgui libide" +host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libgui" +# start-sanitize-ide +host_libs="${host_libs} libide" +# end-sanitize-ide if [ "${enable_gdbgui}" = "yes" ] ; then host_libs="${host_libs} libgui" @@ -232,9 +235,9 @@ case ${with_x} in yes | "") # the default value for this tree is that X11 is available ;; no) - skipdirs="${skipdirs} tk libgui libide gash" + skipdirs="${skipdirs} tk libgui gash" # start-sanitize-ide - skipdirs="${skipdirs} vmake jstools" + skipdirs="${skipdirs} libide vmake jstools" # end-sanitize-ide ;; *) @@ -387,13 +390,13 @@ case "${host}" in 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 sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*) noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; *-*-cygwin32) @@ -408,7 +411,7 @@ case "${host}" in 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 sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; esac @@ -458,7 +461,7 @@ case "${target}" in # start-sanitize-d30v d30v-*-*) # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; # end-sanitize-d30v @@ -495,7 +498,7 @@ case "${target}" in *-*-cygwin32) ;; # keep gdb tcl tk expect etc. *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; esac @@ -542,7 +545,7 @@ case "${target}" in target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide # always build newlib. skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` @@ -551,7 +554,7 @@ case "${target}" in powerpcle-*-solaris*) noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db sn gnuserv" # start-sanitize-ide - noconfigdirs="$noconfigdirs vmake jstools" + noconfigdirs="$noconfigdirs libide vmake jstools" # end-sanitize-ide ;; rs6000-*-lynxos*) -- 2.7.4