diff options
Diffstat (limited to 'gdb/tui')
-rw-r--r-- | gdb/tui/ChangeLog | 21 | ||||
-rw-r--r-- | gdb/tui/Makefile.in | 168 | ||||
-rw-r--r-- | gdb/tui/tui-file.c | 11 | ||||
-rw-r--r-- | gdb/tui/tui.c | 1 | ||||
-rw-r--r-- | gdb/tui/tui.h | 4 | ||||
-rw-r--r-- | gdb/tui/tuiGeneralWin.c | 1 |
6 files changed, 34 insertions, 172 deletions
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index 642b7cb71a1..d492a9d4966 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,24 @@ +Thu May 25 14:46:20 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * tui-file.c: Include "tui.h", "tuiData.h", "tuiIO.h" and + "tuiCommand.h". + (tui_file_fputs): Pass ``file'' and not ``stream'' to + tui_file_adjust_strbuf. + +Thu May 25 16:58:01 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * tui.h: Include <ncurses.h> when available. + * tui.c, tuiGeneralWin.c: Do not include <curses.h>. + +Mon May 15 17:16:10 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in: Delete. + +Tue Apr 18 15:32:15 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (distclean, maintainer-clean, realclean, + mostlyclean): New targets. + Tue Feb 1 00:17:12 2000 Andrew Cagney <cagney@b1.cygnus.com> * tui-file.c, tui-file.h, tuiDisassem.c, tuiIO.c, tuiIO.h, diff --git a/gdb/tui/Makefile.in b/gdb/tui/Makefile.in deleted file mode 100644 index 256464b5bc5..00000000000 --- a/gdb/tui/Makefile.in +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1998 Free Software Foundation, Inc. - -# This file is part of GDB. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -all: libtui.a - -srcdir=@srcdir@ -VPATH = @srcdir@ - -SHELL = @SHELL@ - -CC=@CC@ -CFLAGS=@CFLAGS@ -AR=@AR@ -RANLIB=@RANLIB@ - -# Host and target-dependent makefile fragments come in here. -@host_makefile_frag@ -@target_makefile_frag@ -# End of host and target-dependent makefile fragments - -# Where is our "include" directory? Typically $(srcdir)/../include. -# This is essentially the header file directory for the library -# routines in libiberty. -INCLUDE_DIR = $(srcdir)/../../include -INCLUDE_CFLAGS = -I$(INCLUDE_DIR) - -# Configured by the --with-mmalloc option to configure. -MMALLOC = @MMALLOC@ -MMALLOC_CFLAGS = @MMALLOC_CFLAGS@ - -# Where is the BFD library? Typically in ../bfd. -BFD_DIR = ../../bfd -BFD_SRC = $(srcdir)/$(BFD_DIR) -BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) - -# Where is the READLINE library? Typically in ../readline. -READLINE_DIR = ../../readline -READLINE_SRC = $(srcdir)/$(READLINE_DIR) -READLINE_CFLAGS = -I$(READLINE_SRC) - -# Where is the INTL library? Typically in ../intl. -INTL_DIR = ../../intl -INTL_SRC = $(srcdir)/$(INTL_DIR) -INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) - -# Where is the TCL library? Typically in ../tcl. -TCL_CFLAGS = @TCLHDIR@ - -# Where is the TK library? Typically in ../tk. -TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ - -# Where is Itcl? Typically in ../itcl. -ITCL_CFLAGS = @ITCLHDIR@ - -# Where is Tix? Typically in ../tix. -TIX_CFLAGS = @TIXHDIR@ - -X11_CFLAGS = @TK_XINCLUDES@ - -ENABLE_IDE= @ENABLE_IDE@ - -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` - -IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X) - -ENABLE_CFLAGS= @ENABLE_CFLAGS@ - -# -I. for config files. -# -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also. -# -I$(srcdir)/config for more generic config files. - -# It is also possible that you will need to add -I/usr/include/sys if -# your system doesn't have fcntl.h in /usr/include (which is where it -# should be according to Posix). -DEFS = @DEFS@ -GDB_CFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config $(DEFS) - -# M{H,T}_CFLAGS, if defined, have host- and target-dependent CFLAGS -# from the config directory. -GLOBAL_CFLAGS = $(MT_CFLAGS) $(MH_CFLAGS) -#PROFILE_CFLAGS = -pg - -# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ - $(GDB_CFLAGS) $(READLINE_CFLAGS) $(BFD_CFLAGS) \ - $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) $(INTL_CFLAGS) \ - $(ENABLE_CFLAGS) - -HEADERS = tuiIO.h tuiData.h tuiGeneralWin.h tuiLayout.h tuiStack.h \ - tuiSource.h tuiCommand.h tuiWin.h tuiDisassem.h \ - tuiSourceWin.h tuiRegs.h tuiDataWin.h - -SOURCES = tui.c tuiData.c tuiSource.c tuiStack.c tuiIO.c \ - tuiGeneralWin.c tuiLayout.c tuiWin.c tuiCommand.c \ - tuiDisassem.c tuiSourceWin.c tuiRegs.c tuiDataWin.c - -OBJECTS = tui.o tuiData.o tuiSource.o tuiStack.o tuiIO.o \ - tuiGeneralWin.o tuiLayout.o tuiWin.o tuiCommand.o \ - tuiDisassem.o tuiSourceWin.o tuiRegs.o tuiDataWin.o \ - tuiInit.o - - -# Prevent Sun make from putting in the machine type. Setting -# TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1. -.c.o: - $(CC) -c $(INTERNAL_CFLAGS) $< -.SUFFIXES: .cpp -.c.cpp: - $(CC) -E $(INTERNAL_CFLAGS) $< > $@ - -libtui.a: $(OBJECTS) - rm -f libtui.a - $(AR) rc libtui.a $(OBJECTS) - $(RANLIB) libtui.a - -tui.o: tui.c tui.h tuiData.h tuiLayout.h tuiIO.h tuiRegs.h tuiWin.h -tuiCommand.o: tui.h tuiData.h tuiWin.h tuiIO.h -tuiData.o: tui.h tuiData.h -tuiDataWin.o: tui.h tuiData.h tuiRegs.h -tuiDisassem.o: tui.h tuiData.h tuiLayout.h tuiSourceWin.h tuiStack.h -tuiGeneralWin.o: tui.h tuiData.h tuiGeneralWin.h -tuiIO.o: tui.h tuiData.h tuiIO.h tuiCommand.h tuiWin.h -tuiLayout.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiRegs.h \ - tuiDisassem.h -tuiRegs.o: tui.h tuiData.h tuiLayout.h tuiWin.h -tuiSource.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h -tuiSourceWin.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h \ - tuiDisassem.h -tuiStack.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h -tuiWin.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiSourceWin.h \ - tuiDataWin.h - -tuiInit.o: tuiInit.c -tuiInit.c: $(SOURCES) - @echo Making tuiInit.c - @rm -f init.c-tmp - @echo '/* Do not modify this file. */' >init.c-tmp - @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp - @echo '#include "ansidecl.h"' >>init.c-tmp - @echo 'extern void initialize_tui_files PARAMS ((void));' >>init.c-tmp - @echo 'void initialize_tui_files PARAMS ((void)) {' >>init.c-tmp - @-( cd $(srcdir) ; grep '^_initialize_[a-z_0-9A-Z]* *(' $(SOURCES) ) 2>/dev/null \ - | sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/ {extern void \1 PARAMS ((void)); \1 ();}/' >>init.c-tmp - @echo '}' >>init.c-tmp - @mv init.c-tmp tuiInit.c - -clean: - rm -f *.o *.a diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c index 7822108de8a..9bb28441ed6 100644 --- a/gdb/tui/tui-file.c +++ b/gdb/tui/tui-file.c @@ -22,6 +22,13 @@ #include "ui-file.h" #include "tui/tui-file.h" +#ifdef TUI +#include "tui.h" +#include "tuiData.h" +#include "tuiIO.h" +#include "tuiCommand.h" +#endif + #include <string.h> /* Called instead of fputs for all TUI_FILE output. */ @@ -196,7 +203,7 @@ tui_file_fputs (linebuffer, file) if (stream->ts_streamtype == astring) { - tui_file_adjust_strbuf (strlen (linebuffer), stream); + tui_file_adjust_strbuf (strlen (linebuffer), file); strcat (stream->ts_strbuf, linebuffer); } else @@ -215,7 +222,7 @@ tui_file_fputs (linebuffer, file) /* The normal case - just do a fputs() */ if (stream->ts_streamtype == astring) { - tui_file_adjust_strbuf (strlen (linebuffer), stream); + tui_file_adjust_strbuf (strlen (linebuffer), file); strcat (stream->ts_strbuf, linebuffer); } else diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 1e5593c10f8..a560fdff231 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <ctype.h> #include <malloc.h> -#include <curses.h> #ifdef HAVE_TERM_H #include <term.h> #endif diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h index b80b0e9fd35..179f231212c 100644 --- a/gdb/tui/tui.h +++ b/gdb/tui/tui.h @@ -2,7 +2,11 @@ #ifndef TUI_H #define TUI_H +#if defined (HAVE_NCURSES_H) +#include <ncurses.h> +#elif defined (HAVE_CURSES_H) #include <curses.h> +#endif #ifdef ANSI_PROTOTYPES #include <stdarg.h> diff --git a/gdb/tui/tuiGeneralWin.c b/gdb/tui/tuiGeneralWin.c index b1caf690f75..382d7b3eafc 100644 --- a/gdb/tui/tuiGeneralWin.c +++ b/gdb/tui/tuiGeneralWin.c @@ -3,7 +3,6 @@ ** This module supports general window behavior */ -#include <curses.h> #include "defs.h" #include "tui.h" #include "tuiData.h" |