FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* gdbtk.c: move include of "guitcl.h" back out of IDE ifdef

Browse source 
(gdbtk_init): move ide_initialize_paths out of IDE ifdef

        * configure.in (TCL_LIBS, CONFIG_DEPS): add IDE libraries for all
        builds
        (CONFIG_OBS): remove tracepoint.o, which should always be included

        * configure: regenerate

        * Makefile.in (install-only): ALWAYS install the new gdbtk
        (REMOTE_OBS): add tracepoint.o
This commit is contained in:
Keith Seitz 1997-12-01 20:53:02 +00:00
parent 27e5c6bfb7
commit dd3dd91841
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gdb/ChangeLog
View file

@ -1,3 +1,19 @@
Mon Dec 1 10:19:44 1997 Keith Seitz <keiths@onions.cygnus.com>
* gdbtk.c: move include of "guitcl.h" back out of IDE ifdef
(gdbtk_init): move ide_initialize_paths out of IDE ifdef
* configure.in (TCL_LIBS, CONFIG_DEPS): add IDE libraries for all
builds
(CONFIG_OBS): remove tracepoint.o, which should always be included
* configure: regenerate
* Makefile.in (install-only): ALWAYS install the new gdbtk
(REMOTE_OBS): add tracepoint.o
* ChangeLog: tidy up 11/26 entry
Thu Nov 27 09:07:18 1997 Michael Meissner <meissner@cygnus.com> Thu Nov 27 09:07:18 1997 Michael Meissner <meissner@cygnus.com>
* configure.in ({TCL_LIBS,CONFIG_DEPS}): Don't add IDE libraries * configure.in ({TCL_LIBS,CONFIG_DEPS}): Don't add IDE libraries
@ -33,7 +49,7 @@ Wed Nov 26 11:33:09 1997 Keith Seitz <keiths@onions.cygnus.com>
* tracepoint.c (set_raw_tracepoint): make sure there's a trailing slash on * tracepoint.c (set_raw_tracepoint): make sure there's a trailing slash on
the directory name the directory name
* Merge (lots) with foundry-971118-build * Merge (lots) with foundry's 11/18/97 build
* Makefile.in (install-only): install the new gdbtk, not the old * Makefile.in (install-only): install the new gdbtk, not the old

22
gdb/configure vendored
View file

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.12.1 # Generated automatically using autoconf version 2.12
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@ -348,7 +348,7 @@ EOF
verbose=yes ;; verbose=yes ;;
-version | --version | --versio | --versi | --vers) -version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.12.1" echo "configure generated by autoconf version 2.12"
exit 0 ;; exit 0 ;;
-with-* | --with-*) -with-* | --with-*)
@ -907,7 +907,7 @@ esac
# Make sure we can run config.sub. # Make sure we can run config.sub.
if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : if $ac_config_sub sun4 >/dev/null 2>&1; then :
else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
@ -919,14 +919,14 @@ case "$host_alias" in
NONE) NONE)
case $nonopt in case $nonopt in
NONE) NONE)
if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : if host_alias=`$ac_config_guess`; then :
else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
fi ;; fi ;;
*) host_alias=$nonopt ;; *) host_alias=$nonopt ;;
esac ;; esac ;;
esac esac
host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host=`$ac_config_sub $host_alias`
host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@ -944,7 +944,7 @@ NONE)
esac ;; esac ;;
esac esac
target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` target=`$ac_config_sub $target_alias`
target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@ -962,7 +962,7 @@ NONE)
esac ;; esac ;;
esac esac
build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` build=`$ac_config_sub $build_alias`
build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@ -3098,14 +3098,14 @@ fi
TCL_LIBS='$(LIBIDE) $(IDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' TCL_LIBS='$(LIBIDE) $(IDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
CONFIG_DEPS='$(LIBIDE) $(IDE_DEPS) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)' CONFIG_DEPS='$(LIBIDE) $(IDE_DEPS) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
else else
TCL_LIBS='$(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' TCL_LIBS='$(LIBIDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
CONFIG_DEPS='$(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)' CONFIG_DEPS='$(LIBIDE) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
fi fi
# Yes, the ordering seems wrong here. But it isn't. # Yes, the ordering seems wrong here. But it isn't.
# TK_LIBS is the list of libraries that need to be linked # TK_LIBS is the list of libraries that need to be linked
# after Tcl/Tk. # after Tcl/Tk.
LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}" LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
CONFIG_OBS="${CONFIG_OBS} gdbtk.o tracepoint.o" CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
if test x$gdb_cv_os_cygwin32 = xyes; then if test x$gdb_cv_os_cygwin32 = xyes; then
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32" WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"
@ -3477,7 +3477,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v) -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.12.1" echo "$CONFIG_STATUS generated by autoconf version 2.12"
exit 0 ;; exit 0 ;;
-help | --help | --hel | --he | --h) -help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;; echo "\$ac_cs_usage"; exit 0 ;;

6
gdb/configure.in
View file

@ -354,14 +354,14 @@ if test "${enable_gdbtk}" = "yes"; then
TCL_LIBS='$(LIBIDE) $(IDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' TCL_LIBS='$(LIBIDE) $(IDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
CONFIG_DEPS='$(LIBIDE) $(IDE_DEPS) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)' CONFIG_DEPS='$(LIBIDE) $(IDE_DEPS) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
else else
TCL_LIBS='$(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' TCL_LIBS='$(LIBIDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
CONFIG_DEPS='$(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)' CONFIG_DEPS='$(LIBIDE) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
fi fi
# Yes, the ordering seems wrong here. But it isn't. # Yes, the ordering seems wrong here. But it isn't.
# TK_LIBS is the list of libraries that need to be linked # TK_LIBS is the list of libraries that need to be linked
# after Tcl/Tk. # after Tcl/Tk.
LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}" LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
CONFIG_OBS="${CONFIG_OBS} gdbtk.o tracepoint.o" CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
if test x$gdb_cv_os_cygwin32 = xyes; then if test x$gdb_cv_os_cygwin32 = xyes; then
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32" WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"

4
gdb/gdbtk.c
View file

@ -38,10 +38,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <tk.h> #include <tk.h>
#include <itcl.h> #include <itcl.h>
#include <tix.h> #include <tix.h>
#include "guitcl.h"
#ifdef IDE #ifdef IDE
/* start-sanitize-ide */ /* start-sanitize-ide */
#include "guitcl.h"
#include "event.h" #include "event.h"
#include "idetcl.h" #include "idetcl.h"
#include "ilutk.h" #include "ilutk.h"
@ -1759,10 +1759,10 @@ gdbtk_init ( argv0 )
make_final_cleanup (gdbtk_cleanup, NULL); make_final_cleanup (gdbtk_cleanup, NULL);
/* Initialize the Paths variable. */ /* Initialize the Paths variable. */
#ifdef IDE
if (ide_initialize_paths (interp, "gdbtcl") != TCL_OK) if (ide_initialize_paths (interp, "gdbtcl") != TCL_OK)
error ("ide_initialize_paths failed: %s", interp->result); error ("ide_initialize_paths failed: %s", interp->result);
#ifdef IDE
/* start-sanitize-ide */ /* start-sanitize-ide */
/* Find the directory where we expect to find idemanager. We ignore /* Find the directory where we expect to find idemanager. We ignore
errors since it doesn't really matter if this fails. */ errors since it doesn't really matter if this fails. */