Add tracepoint.o to gdbtk builds

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b35f66bd7ab5c61357827a6e92e5e66bc65b3e6e..be5dba5c59e90931c554249ee0c9f5ee4ff34e42 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,11 +2,19 @@ Thu Nov 27 09:07:18 1997  Michael Meissner  <meissner@cygnus.com>
 
        * configure.in ({TCL_LIBS,CONFIG_DEPS}): Don't add IDE libraries
        if not --enable-ide.
+       (CONFIG_OBS): Add tracepoint.o to list if --enable-gdbtk.
        * configure: Regenerate.
 
        * gdbtk.c (gdb_get_breakpoint_info): Add missing filename
        argument.
        (toplevel): Move include of guitcl.h into #ifdef IDE region.
+       (gdbtk_init): Move ide_initialize_paths call into #ifdef IDE
+       section.
+
+       * Makefile.in (tracepoint_h): New macro for tracepoint.h
+       includes.
+       (tracepoint.o): Add rule to build.
+       (gdbtk.o): Update dependencies.
 
 Wed Nov 26 22:59:04 1997  Jeffrey A Law  (law@cygnus.com)
 

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index dfabb72fcc490fd15ee4dbc4ca753714df1a4b18..c3a52a7cdb0a2a9da2fc29deff13a89c317c7acd 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -454,6 +454,7 @@ gdbcmd_h =  gdbcmd.h $(command_h)
 defs_h =       defs.h xm.h tm.h nm.h config.status config.h
 
 inferior_h =   inferior.h $(breakpoint_h)
+tracepoint_h = tracepoint.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
@@ -1133,10 +1134,14 @@ fork-child.o: fork-child.c $(wait_h) $(defs_h) $(gdbcore_h) \
 
 # start-sanitize-gdbtk
 gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
-       $(bfd_h) symfile.h objfiles.h target.h gdb_string.h
+       $(bfd_h) symfile.h objfiles.h target.h gdb_string.h $(tracepoint_h)
        $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) $(TIX_CFLAGS) \
        $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
                $(srcdir)/gdbtk.c -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+
+tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(tracepoint_h) \
+       $(gdbtypes_h) $(expression_h) $(gdbcmd_h) $(value_h) target.h \
+       language.h gdb_string.h $(readline_headers)
 # end-sanitize-gdbtk
 
 gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \

diff --git a/gdb/configure b/gdb/configure
index 3416a6180ede99a7920b87e81abfdb6e2d4721e6..30318842adee8089739bdbef4deb9508370f2ef5 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -3105,7 +3105,7 @@ fi
           # TK_LIBS is the list of libraries that need to be linked
           # after Tcl/Tk.
           LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
-          CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
+          CONFIG_OBS="${CONFIG_OBS} gdbtk.o tracepoint.o"
 
           if test x$gdb_cv_os_cygwin32 = xyes; then
              WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"

diff --git a/gdb/configure.in b/gdb/configure.in
index 83a65c621c3ca8de0f6b1fbeaf63ca54ea0d88a9..6fb63ea64924f5d2e44a1f1c065a20ed6ce5eb9e 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -361,7 +361,7 @@ if test "${enable_gdbtk}" = "yes"; then
           # TK_LIBS is the list of libraries that need to be linked
           # after Tcl/Tk.
           LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
-          CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
+          CONFIG_OBS="${CONFIG_OBS} gdbtk.o tracepoint.o"
 
           if test x$gdb_cv_os_cygwin32 = xyes; then
              WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index d562e296358e21977496fc36eb9b36105f9e1812..f5ca6369560f1c78a79f41a10673c45c6d77abe2 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -1759,10 +1759,10 @@ gdbtk_init ( argv0 )
   make_final_cleanup (gdbtk_cleanup, NULL);
 
   /* Initialize the Paths variable.  */
+#ifdef IDE
   if (ide_initialize_paths (interp, "gdbtcl") != TCL_OK)
     error ("ide_initialize_paths failed: %s", interp->result);
 
-#ifdef IDE
   /* start-sanitize-ide */
   /* Find the directory where we expect to find idemanager.  We ignore
      errors since it doesn't really matter if this fails.  */