2004-02-28 Andrew Cagney <cagney@redhat.com>

* utils.c: Use "", instead of <>, to include readline.
	tui/tui-win.c, tui/tui.c, tui/tui-hooks.c: Ditto.
	* tracepoint.c, top.c, symmisc.c, symfile.c: Ditto.
	* source.c, solib.c, exec.c, event-top.c: Ditto.
	* corelow.c, completer.c, cli/cli-setshow.c: Ditto.
	* cli/cli-dump.c, cli/cli-cmds.c: Ditto.
	* Makefile.in: Update all dependencies.
	(readline_tilde_h, readline_history_h): Define.
	(readline_headers): Delete.
This commit is contained in:
Andrew Cagney 2004-02-28 18:04:37 +00:00
parent 91ae43031c
commit dbda997201
19 changed files with 70 additions and 58 deletions

View File

@ -1,3 +1,15 @@
2004-02-28 Andrew Cagney <cagney@redhat.com>
* utils.c: Use "", instead of <>, to include readline.
tui/tui-win.c, tui/tui.c, tui/tui-hooks.c: Ditto.
* tracepoint.c, top.c, symmisc.c, symfile.c: Ditto.
* source.c, solib.c, exec.c, event-top.c: Ditto.
* corelow.c, completer.c, cli/cli-setshow.c: Ditto.
* cli/cli-dump.c, cli/cli-cmds.c: Ditto.
* Makefile.in: Update all dependencies.
(readline_tilde_h, readline_history_h): Define.
(readline_headers): Delete.
2004-02-28 Mark Kettenis <kettenis@gnu.org>
* config/djgpp/fnchange.lst: Rename "config/i386/nm-linux64.h" to

View File

@ -576,6 +576,8 @@ demangle_h = $(INCLUDE_DIR)/demangle.h
obstack_h = $(INCLUDE_DIR)/obstack.h
opcode_m68hc11_h = $(INCLUDE_DIR)/opcode/m68hc11.h
readline_h = $(READLINE_SRC)/readline.h
readline_tilde_h = $(READLINE_SRC)/tilde.h
readline_history_h = $(READLINE_SRC)/history.h
frv_desc_h = $(OPCODES_SRC)/frv-desc.h
sh_opc_h = $(OPCODES_SRC)/sh-opc.h
gdb_sim_arm_h = $(INCLUDE_DIR)/gdb/sim-arm.h
@ -584,12 +586,6 @@ gdb_sim_frv_h = $(INCLUDE_DIR)/gdb/sim-frv.h
gdb_sim_sh_h = $(INCLUDE_DIR)/gdb/sim-sh.h
splay_tree_h = $(INCLUDE_DIR)/splay-tree.h
readline_headers = \
$(READLINE_SRC)/chardefs.h \
$(READLINE_SRC)/history.h \
$(READLINE_SRC)/keymaps.h \
$(READLINE_SRC)/readline.h
#
# $BUILD/ headers
#
@ -1632,7 +1628,7 @@ complaints.o: complaints.c $(defs_h) $(complaints_h) $(gdb_assert_h) \
$(command_h) $(gdbcmd_h)
completer.o: completer.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \
$(filenames_h) $(language_h) $(cli_decode_h) $(gdbcmd_h) \
$(completer_h)
$(readline_h) $(completer_h)
copying.o: copying.c $(defs_h) $(command_h) $(gdbcmd_h)
core-aout.o: core-aout.c $(defs_h) $(gdbcore_h) $(value_h) $(regcache_h) \
$(gdb_dirent_h) $(gdb_stat_h)
@ -1642,7 +1638,7 @@ corefile.o: corefile.c $(defs_h) $(gdb_string_h) $(inferior_h) $(symtab_h) \
corelow.o: corelow.c $(defs_h) $(arch_utils_h) $(gdb_string_h) $(frame_h) \
$(inferior_h) $(symtab_h) $(command_h) $(bfd_h) $(target_h) \
$(gdbcore_h) $(gdbthread_h) $(regcache_h) $(regset_h) $(symfile_h) \
$(exec_h) $(gdb_assert_h)
$(exec_h) $(readline_h) $(gdb_assert_h)
core-regset.o: core-regset.c $(defs_h) $(command_h) $(gdbcore_h) \
$(inferior_h) $(target_h) $(gdb_string_h) $(gregset_h)
cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) $(gdbcmd_h) \
@ -1660,11 +1656,12 @@ cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \
$(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \
$(demangle_h) $(annotate_h) $(gdb_string_h) $(c_lang_h) $(target_h) \
$(cp_abi_h) $(valprint_h)
cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(inferior_h) \
$(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) $(value_h) \
$(opcode_cris_h) $(arch_utils_h) $(regcache_h) $(gdb_assert_h) \
$(objfiles_h) $(solib_h) $(solib_svr4_h) $(gdb_string_h) \
$(dis_asm_h)
cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
$(frame_base_h) $(trad_frame_h) $(dwarf2_frame_h) $(symtab_h) \
$(inferior_h) $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \
$(value_h) $(opcode_cris_h) $(arch_utils_h) $(regcache_h) \
$(gdb_assert_h) $(objfiles_h) $(solib_h) $(solib_svr4_h) \
$(gdb_string_h) $(dis_asm_h)
c-typeprint.o: c-typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \
$(gdbtypes_h) $(expression_h) $(value_h) $(gdbcore_h) $(target_h) \
$(language_h) $(demangle_h) $(c_lang_h) $(typeprint_h) $(cp_abi_h) \
@ -1737,10 +1734,11 @@ event-loop.o: event-loop.c $(defs_h) $(event_loop_h) $(event_top_h) \
$(gdb_string_h)
event-top.o: event-top.c $(defs_h) $(top_h) $(inferior_h) $(target_h) \
$(terminal_h) $(event_loop_h) $(event_top_h) $(interps_h) \
$(gdbcmd_h)
$(gdbcmd_h) $(readline_h) $(readline_history_h)
exec.o: exec.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) $(gdbcmd_h) \
$(language_h) $(symfile_h) $(objfiles_h) $(completer_h) $(value_h) \
$(exec_h) $(gdb_string_h) $(gdbcore_h) $(gdb_stat_h) $(xcoffsolib_h)
$(exec_h) $(readline_h) $(gdb_string_h) $(gdbcore_h) $(gdb_stat_h) \
$(xcoffsolib_h)
expprint.o: expprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \
$(value_h) $(language_h) $(parser_defs_h) $(user_regs_h) $(target_h) \
$(gdb_string_h) $(block_h)
@ -2296,7 +2294,7 @@ solib-aix5.o: solib-aix5.c $(defs_h) $(gdb_string_h) $(elf_external_h) \
solib.o: solib.c $(defs_h) $(gdb_string_h) $(symtab_h) $(bfd_h) $(symfile_h) \
$(objfiles_h) $(gdbcore_h) $(command_h) $(target_h) $(frame_h) \
$(gdb_regex_h) $(inferior_h) $(environ_h) $(language_h) $(gdbcmd_h) \
$(completer_h) $(filenames_h) $(exec_h) $(solist_h)
$(completer_h) $(filenames_h) $(exec_h) $(solist_h) $(readline_h)
solib-irix.o: solib-irix.c $(defs_h) $(symtab_h) $(bfd_h) $(symfile_h) \
$(objfiles_h) $(gdbcore_h) $(target_h) $(inferior_h) $(solist_h)
solib-legacy.o: solib-legacy.c $(defs_h) $(gdbcore_h) $(solib_svr4_h)
@ -2323,7 +2321,7 @@ source.o: source.c $(defs_h) $(symtab_h) $(expression_h) $(language_h) \
$(command_h) $(source_h) $(gdbcmd_h) $(frame_h) $(value_h) \
$(gdb_string_h) $(gdb_stat_h) $(gdbcore_h) $(gdb_regex_h) \
$(symfile_h) $(objfiles_h) $(annotate_h) $(gdbtypes_h) $(linespec_h) \
$(filenames_h) $(completer_h) $(ui_out_h)
$(filenames_h) $(completer_h) $(ui_out_h) $(readline_h)
sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(sparc64_tdep_h) \
$(sparc_nat_h)
sparc64fbsd-tdep.o: sparc64fbsd-tdep.c $(defs_h) $(frame_h) \
@ -2401,8 +2399,8 @@ symfile.o: symfile.c $(defs_h) $(bfdlink_h) $(symtab_h) $(gdbtypes_h) \
$(objfiles_h) $(source_h) $(gdbcmd_h) $(breakpoint_h) $(language_h) \
$(complaints_h) $(demangle_h) $(inferior_h) $(filenames_h) \
$(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \
$(hashtab_h) $(gdb_assert_h) $(block_h) $(gdb_string_h) \
$(gdb_stat_h)
$(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \
$(gdb_string_h) $(gdb_stat_h)
symmisc.o: symmisc.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(bfd_h) \
$(symfile_h) $(objfiles_h) $(breakpoint_h) $(command_h) \
$(gdb_obstack_h) $(language_h) $(bcache_h) $(block_h) $(gdb_regex_h) \
@ -2427,13 +2425,14 @@ top.o: top.c $(defs_h) $(gdbcmd_h) $(call_cmds_h) $(cli_cmds_h) \
$(inferior_h) $(target_h) $(breakpoint_h) $(gdbtypes_h) \
$(expression_h) $(value_h) $(language_h) $(terminal_h) $(annotate_h) \
$(completer_h) $(top_h) $(version_h) $(serial_h) $(doublest_h) \
$(gdb_assert_h) $(event_top_h) $(gdb_string_h) $(gdb_stat_h) \
$(ui_out_h) $(cli_out_h)
$(gdb_assert_h) $(readline_h) $(readline_history_h) $(event_top_h) \
$(gdb_string_h) $(gdb_stat_h) $(ui_out_h) $(cli_out_h)
tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(gdbtypes_h) \
$(expression_h) $(gdbcmd_h) $(value_h) $(target_h) $(language_h) \
$(gdb_string_h) $(inferior_h) $(tracepoint_h) $(remote_h) \
$(linespec_h) $(regcache_h) $(completer_h) $(gdb_events_h) \
$(block_h) $(dictionary_h) $(ax_h) $(ax_gdb_h)
$(block_h) $(dictionary_h) $(ax_h) $(ax_gdb_h) $(readline_h) \
$(readline_history_h)
trad-frame.o: trad-frame.c $(defs_h) $(frame_h) $(trad_frame_h) \
$(regcache_h)
typeprint.o: typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \
@ -2448,7 +2447,7 @@ user-regs.o: user-regs.c $(defs_h) $(user_regs_h) $(gdbtypes_h) \
utils.o: utils.c $(defs_h) $(gdb_assert_h) $(gdb_string_h) $(event_top_h) \
$(tui_h) $(gdbcmd_h) $(serial_h) $(bfd_h) $(target_h) $(demangle_h) \
$(expression_h) $(language_h) $(charset_h) $(annotate_h) \
$(filenames_h) $(inferior_h)
$(filenames_h) $(inferior_h) $(readline_h)
uw-thread.o: uw-thread.c $(defs_h) $(gdbthread_h) $(target_h) $(inferior_h) \
$(regcache_h) $(gregset_h)
v850ice.o: v850ice.c $(defs_h) $(gdb_string_h) $(frame_h) $(symtab_h) \
@ -2505,12 +2504,13 @@ xstormy16-tdep.o: xstormy16-tdep.c $(defs_h) $(value_h) $(inferior_h) \
# Need to explicitly specify the compile rule as make will do nothing
# or try to compile the object file into the sub-directory.
cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(defs_h) $(completer_h) $(target_h) \
$(gdb_wait_h) $(gdb_regex_h) $(gdb_string_h) $(gdb_vfork_h) \
$(linespec_h) $(expression_h) $(frame_h) $(value_h) $(language_h) \
$(filenames_h) $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) \
$(top_h) $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) \
$(cli_cmds_h) $(tui_h)
cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(defs_h) $(readline_h) \
$(readline_tilde_h) $(completer_h) $(target_h) $(gdb_wait_h) \
$(gdb_regex_h) $(gdb_string_h) $(gdb_vfork_h) $(linespec_h) \
$(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \
$(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
$(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \
$(tui_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
$(gdb_regex_h) $(gdb_string_h) $(ui_out_h) $(cli_cmds_h) \
@ -2518,7 +2518,7 @@ cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-decode.c
cli-dump.o: $(srcdir)/cli/cli-dump.c $(defs_h) $(gdb_string_h) \
$(cli_decode_h) $(cli_cmds_h) $(value_h) $(completer_h) \
$(cli_dump_h) $(gdb_assert_h) $(target_h)
$(cli_dump_h) $(gdb_assert_h) $(target_h) $(readline_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-dump.c
cli-interp.o: $(srcdir)/cli/cli-interp.c $(defs_h) $(interps_h) $(wrapper_h) \
$(event_top_h) $(ui_out_h) $(cli_out_h) $(top_h) $(gdb_string_h)
@ -2530,8 +2530,8 @@ cli-script.o: $(srcdir)/cli/cli-script.c $(defs_h) $(value_h) $(language_h) \
$(ui_out_h) $(gdb_string_h) $(top_h) $(cli_cmds_h) $(cli_decode_h) \
$(cli_script_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-script.c
cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(defs_h) $(value_h) \
$(gdb_string_h) $(ui_out_h) $(cli_decode_h) $(cli_cmds_h) \
cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(defs_h) $(readline_tilde_h) \
$(value_h) $(gdb_string_h) $(ui_out_h) $(cli_decode_h) $(cli_cmds_h) \
$(cli_setshow_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-setshow.c
cli-utils.o: $(srcdir)/cli/cli-utils.c $(defs_h) $(cli_utils_h)
@ -2778,8 +2778,8 @@ signals.o: $(srcdir)/signals/signals.c $(server_h) $(defs_h) $(target_h) \
tui.o: $(srcdir)/tui/tui.c $(defs_h) $(gdbcmd_h) $(tui_h) $(tui_hooks_h) \
$(tui_data_h) $(tui_layout_h) $(tui_io_h) $(tui_regs_h) \
$(tui_stack_h) $(tui_win_h) $(tui_winsource_h) $(tui_windata_h) \
$(readline_h) $(target_h) $(frame_h) $(breakpoint_h) $(inferior_h) \
$(symtab_h) $(source_h) $(gdb_curses_h)
$(target_h) $(frame_h) $(breakpoint_h) $(inferior_h) $(symtab_h) \
$(source_h) $(gdb_curses_h) $(readline_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui.c
tui-command.o: $(srcdir)/tui/tui-command.c $(defs_h) $(tui_h) $(tui_data_h) \
$(tui_win_h) $(tui_io_h) $(gdb_curses_h) $(gdb_string_h)
@ -2798,8 +2798,8 @@ tui-file.o: $(srcdir)/tui/tui-file.c $(defs_h) $(ui_file_h) $(tui_file_h) \
tui-hooks.o: $(srcdir)/tui/tui-hooks.c $(defs_h) $(symtab_h) $(inferior_h) \
$(command_h) $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \
$(gdbcore_h) $(event_loop_h) $(event_top_h) $(frame_h) \
$(breakpoint_h) $(gdb_events_h) $(ui_out_h) $(top_h) $(tui_h) \
$(tui_hooks_h) $(tui_data_h) $(tui_layout_h) $(tui_io_h) \
$(breakpoint_h) $(gdb_events_h) $(ui_out_h) $(top_h) $(readline_h) \
$(tui_h) $(tui_hooks_h) $(tui_data_h) $(tui_layout_h) $(tui_io_h) \
$(tui_regs_h) $(tui_win_h) $(tui_stack_h) $(tui_windata_h) \
$(tui_winsource_h) $(gdb_curses_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-hooks.c
@ -2845,7 +2845,7 @@ tui-win.o: $(srcdir)/tui/tui-win.c $(defs_h) $(command_h) $(symtab_h) \
$(breakpoint_h) $(frame_h) $(cli_cmds_h) $(top_h) $(source_h) \
$(tui_h) $(tui_data_h) $(tui_wingeneral_h) $(tui_stack_h) \
$(tui_regs_h) $(tui_disasm_h) $(tui_source_h) $(tui_winsource_h) \
$(tui_windata_h) $(gdb_curses_h) $(gdb_string_h)
$(tui_windata_h) $(gdb_curses_h) $(gdb_string_h) $(readline_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-win.c
tui-windata.o: $(srcdir)/tui/tui-windata.c $(defs_h) $(tui_h) $(tui_data_h) \
$(tui_wingeneral_h) $(tui_regs_h) $(gdb_string_h) $(gdb_curses_h)

View File

@ -20,8 +20,8 @@
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include <readline/readline.h>
#include <readline/tilde.h>
#include "readline/readline.h"
#include "readline/tilde.h"
#include "completer.h"
#include "target.h" /* For baud_rate, remote_debug and remote_timeout */
#include "gdb_wait.h" /* For shell escape implementation */

View File

@ -31,7 +31,7 @@
#include "gdb_assert.h"
#include <ctype.h>
#include "target.h"
#include <readline/readline.h>
#include "readline/readline.h"
#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))

View File

@ -18,7 +18,7 @@
Boston, MA 02111-1307, USA. */
#include "defs.h"
#include <readline/tilde.h>
#include "readline/tilde.h"
#include "value.h"
#include <ctype.h>
#include "gdb_string.h"

View File

@ -33,7 +33,7 @@
/* Needed for rl_completer_word_break_characters() and for
rl_filename_completion_function. */
#include <readline/readline.h>
#include "readline/readline.h"
/* readline defines this. */
#undef savestring

View File

@ -42,7 +42,7 @@
#include "regset.h"
#include "symfile.h"
#include "exec.h"
#include <readline/readline.h>
#include "readline/readline.h"
#include "gdb_assert.h"

View File

@ -33,8 +33,8 @@
#include "gdbcmd.h"
/* readline include files */
#include <readline/readline.h>
#include <readline/history.h>
#include "readline/readline.h"
#include "readline/history.h"
/* readline defines this. */
#undef savestring

View File

@ -38,7 +38,7 @@
#endif
#include <fcntl.h>
#include <readline/readline.h>
#include "readline/readline.h"
#include "gdb_string.h"
#include "gdbcore.h"

View File

@ -42,7 +42,7 @@
#include "filenames.h" /* for DOSish file names */
#include "exec.h"
#include "solist.h"
#include <readline/readline.h>
#include "readline/readline.h"
/* external data declarations */

View File

@ -44,7 +44,7 @@
#include "filenames.h" /* for DOSish file names */
#include "completer.h"
#include "ui-out.h"
#include <readline/readline.h>
#include "readline/readline.h"
#ifdef CRLF_SOURCE_FILES

View File

@ -45,7 +45,7 @@
#include "completer.h"
#include "bcache.h"
#include "hashtab.h"
#include <readline/readline.h>
#include "readline/readline.h"
#include "gdb_assert.h"
#include "block.h"

View File

@ -37,7 +37,7 @@
#include "dictionary.h"
#include "gdb_string.h"
#include <readline/readline.h>
#include "readline/readline.h"
#ifndef DEV_TTY
#define DEV_TTY "/dev/tty"

View File

@ -47,8 +47,8 @@
#include "gdb_assert.h"
/* readline include files */
#include <readline/readline.h>
#include <readline/history.h>
#include "readline/readline.h"
#include "readline/history.h"
/* readline defines this. */
#undef savestring

View File

@ -44,8 +44,8 @@
#include "ax-gdb.h"
/* readline include files */
#include <readline/readline.h>
#include <readline/history.h>
#include "readline/readline.h"
#include "readline/history.h"
/* readline defines this. */
#undef savestring

View File

@ -35,7 +35,7 @@
#include "gdb-events.h"
#include "ui-out.h"
#include "top.h"
#include <readline/readline.h>
#include "readline/readline.h"
#include <unistd.h>
#include <fcntl.h>

View File

@ -50,7 +50,7 @@
#include "gdb_string.h"
#include <ctype.h>
#include <readline/readline.h>
#include "readline/readline.h"
/*******************************
** Static Local Decls

View File

@ -59,7 +59,7 @@
/* This redefines CTRL if it is not already defined, so it must come
after terminal state releated include files like <term.h> and
"gdb_ncurses.h". */
#include <readline/readline.h>
#include "readline/readline.h"
/* Tells whether the TUI is active or not. */
int tui_active = 0;

View File

@ -63,7 +63,7 @@
#include <term.h>
#endif
#include <readline/readline.h>
#include "readline/readline.h"
#ifdef NEED_DECLARATION_MALLOC
extern PTR malloc (); /* OK: PTR */