From fa41e1a3faf7e9778b82b30892434cb98c65bf94 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Mon, 21 Sep 1998 18:37:32 +0000 Subject: Added sanitize-ide markers --- gdb/ChangeLog-gdbtk | 8 +++++++ gdb/Makefile.in | 40 ++++++++++++++++------------------ gdb/configure | 62 +++++++++++++++++++++++++++-------------------------- gdb/configure.in | 2 ++ 4 files changed, 61 insertions(+), 51 deletions(-) diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk index 549fd06..bed4b84 100644 --- a/gdb/ChangeLog-gdbtk +++ b/gdb/ChangeLog-gdbtk @@ -1,3 +1,11 @@ +start-sanitize-ide +Mon Sep 21 13:33:27 1998 Drew Moseley + + * Makefile.in: Added sanitize markers around IDE code + * configure.in (host_libs): Added sanitize markers around IDE code + * configure: Regenerated configure from configure.in + +end-sanitize-ide 1998-09-18 Keith Seitz * gdbtk-cmds.c (get_frame_name): Demangle function names, too. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 2da0019..6f4a9eb 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -163,30 +163,20 @@ WIN32LDAPP = @WIN32LDAPP@ WIN32LIBS = @WIN32LIBS@ ENABLE_GDBTK= @ENABLE_GDBTK@ +#start-sanitize-ide ENABLE_IDE= @ENABLE_IDE@ -LIBGUI = ../libgui/src/libgui.a - -GUI_CFLAGS_X = -I$(srcdir)/../libgui/src - -IDE_CFLAGS_X = -I$(srcdir)/../libidetcl/src -I$(srcdir)/../libide/src \ - `if [ x"$(ENABLE_IDE)" != x ] ; then \ - echo -DIDE -I$(srcdir)/../ilu/runtime/mainloop;\ - fi` - -LIBIDETCL = ../libidetcl/src/libidetcl.a -LIBIDE = ../libide/src/libide.a - -IDE_X = ` \ - if [ x"$(ENABLE_IDE)" != x ] ; then \ - echo -L../ilu/runtime/mainloop -lilu-Tk -L../ilu/runtime/c -lilu-c -L../ilu/runtime/kernel -lilu;\ - fi` - -IDE_DEPS = ../ilu/runtime/mainloop/libilu-Tk.a \ - ../ilu/runtime/c/libilu-c.a ../ilu/runtime/kernel/libilu.a - +FOUNDRY_LIB_BASE= @FOUNDRY_LIB_BASE@ +LIBGUI = @LIBGUI@ +GUI_CFLAGS_X = @GUI_CFLAGS_X@ +IDE_CFLAGS_X = @IDE_CFLAGS_X@ +IDE_X = @IDE_X@ +LIBIDETCL = @LIBIDETCL@ +LIBIDE = @LIBIDE@ +IDE_DEPS = @IDE_DEPS@ IDE=$(IDE_X) IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X) +#end-sanitize-ide #end-sanitize-gdbtk ENABLE_CFLAGS= @ENABLE_CFLAGS@ @@ -463,6 +453,7 @@ defs_h = defs.h xm.h tm.h nm.h config.status config.h inferior_h = inferior.h $(breakpoint_h) tracepoint_h = tracepoint.h +ax_h = ax.h # Header files that need to have srcdir added. Note that in the cases # where we use a macro like $(gdbcmd_h), things are carefully arranged @@ -1198,6 +1189,13 @@ tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(tracepoint_h) \ language.h gdb_string.h $(readline_headers) # end-sanitize-gdbtk +v850ice.o: v850ice.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \ + $(frame_h) $(breakpoint_h) $(gdbcore_h) $(value_h) symfile.h \ + gdb_string.h target.h objfiles.h + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) $(TIX_CFLAGS) \ + $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ + $(srcdir)/v850ice.c + gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \ $(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \ $(value_h) gdb_string.h @@ -1582,7 +1580,7 @@ stabsread.o: stabsread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \ stack.o: stack.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \ language.h target.h gdb_string.h -ax-general.o: ax-general.c $(ax_h) +ax-general.o: ax-general.c $(ax_h) $(defs_h) ax-gdb.o: ax-gdb.c $(defs_h) $(symtab_h) symfile.h $(gdbtypes_h) \ $(value_h) $(expression_h) $(command_h) $(ax_h) $(gdbcmd_h) ax-gdb.h diff --git a/gdb/configure b/gdb/configure index 59e1e77..1b552d1 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4551,6 +4551,7 @@ EOF fi # start-sanitize-gdbtk +# start-sanitize-ide ENABLE_IDE= # Check whether --enable-ide or --disable-ide was given. if test "${enable_ide+set}" = set; then @@ -4612,6 +4613,7 @@ fi +# end-sanitize-ide ENABLE_GDBTK= @@ -4650,12 +4652,12 @@ fi # In the cygwin32 environment, we need some additional flags. echo $ac_n "checking for cygwin32""... $ac_c" 1>&6 -echo "configure:4654: checking for cygwin32" >&5 +echo "configure:4656: checking for cygwin32" >&5 if eval "test \"`echo '$''{'gdb_cv_os_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:4716: checking for Tcl configuration" >&5 +echo "configure:4718: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4820,7 +4822,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:4824: checking for Tk configuration" >&5 +echo "configure:4826: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4916,7 +4918,7 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 -echo "configure:4920: checking for Tcl private headers. dir=${configdir}" >&5 +echo "configure:4922: checking for Tcl private headers. dir=${configdir}" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -4982,17 +4984,17 @@ fi if test x"${ac_cv_c_tclh}" = x ; then ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 -echo "configure:4986: checking for tclInt.h" >&5 +echo "configure:4988: checking for tclInt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5052,7 +5054,7 @@ fi # no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:5056: checking for Tk private headers" >&5 +echo "configure:5058: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -5118,17 +5120,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:5122: checking for tk.h" >&5 +echo "configure:5124: checking for tk.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5174,7 +5176,7 @@ fi echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:5178: checking for Itcl private headers. srcdir=${srcdir}" >&5 +echo "configure:5180: checking for Itcl private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itclh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do if test -f $i/src/itcl.h ; then @@ -5197,7 +5199,7 @@ fi echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:5201: checking for Tix private headers. srcdir=${srcdir}" >&5 +echo "configure:5203: checking for Tix private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_tixh}" = x ; then for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do if test -f $i/generic/tix.h ; then @@ -5291,7 +5293,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5295: checking for X" >&5 +echo "configure:5297: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5353,12 +5355,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5427,14 +5429,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5555,7 +5557,7 @@ fi # end-sanitize-sky echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6 -echo "configure:5559: checking for wctype in -lw" >&5 +echo "configure:5561: checking for wctype in -lw" >&5 ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5563,7 +5565,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5738,7 +5740,7 @@ links="${links} nm.h" fi # start-sanitize-gdbtk echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:5742: checking whether ln -s works" >&5 +echo "configure:5744: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5773,19 +5775,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:5777: checking for Cygwin32 environment" >&5 +echo "configure:5779: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -5802,19 +5804,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:5806: checking for Mingw32 environment" >&5 +echo "configure:5808: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -5833,7 +5835,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:5837: checking for executable suffix" >&5 +echo "configure:5839: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/gdb/configure.in b/gdb/configure.in index db97554..8aba768 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -298,6 +298,7 @@ if test x$want_mmalloc = xtrue; then fi # start-sanitize-gdbtk +# start-sanitize-ide ENABLE_IDE= AC_ARG_ENABLE(ide, [ --enable-ide Enable IDE support]) if test "$enable_ide" = yes; then @@ -351,6 +352,7 @@ AC_SUBST(IDE_X) AC_SUBST(LIBIDETCL) AC_SUBST(LIBIDE) AC_SUBST(IDE_DEPS) +# end-sanitize-ide ENABLE_GDBTK= -- cgit v1.1