1 diff -urN gdb-5.0.org/Makefile.in gdb-5.0/Makefile.in
2 --- gdb-5.0.org/Makefile.in Thu May 18 07:00:23 2000
3 +++ gdb-5.0/Makefile.in Tue Sep 5 18:32:37 2000
37 all-gcc: all-bison all-byacc all-binutils all-gas all-ld
38 all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
39 GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
40 -all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
41 +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
44 configure-target-gperf: $(ALL_GCC)
45 @@ -1606,12 +1602,11 @@
47 all-prms: all-libiberty
50 all-recode: all-libiberty
51 all-sed: all-libiberty
54 -all-sim: all-libiberty all-bfd all-opcodes all-readline
55 +all-sim: all-libiberty all-bfd all-opcodes
56 all-tar: all-libiberty
60 SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
63 -GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
64 +GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
65 gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
66 $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
67 MD5PROG="$(MD5PROG)" \
68 diff -urN gdb-5.0.org/gdb/Makefile.in gdb-5.0/gdb/Makefile.in
69 --- gdb-5.0.org/gdb/Makefile.in Tue Sep 5 18:30:00 2000
70 +++ gdb-5.0/gdb/Makefile.in Tue Sep 5 19:15:00 2000
72 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
74 # Where is the READLINE library? Typically in ../readline.
75 -READLINE_DIR = ../readline
76 -READLINE = $(READLINE_DIR)/libreadline.a
77 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
78 -READLINE_CFLAGS = -I$(READLINE_SRC)/..
79 +READLINE_DIR = /usr/include/readline
80 +READLINE = -lreadline
81 +READLINE_SRC = /usr/include/readline
82 +READLINE_CFLAGS = -I/usr/include/readline
84 WARN_CFLAGS = @WARN_CFLAGS@
85 WERROR_CFLAGS = @WERROR_CFLAGS@
86 diff -urN gdb-5.0.org/gdb/event-top.c gdb-5.0/gdb/event-top.c
87 --- gdb-5.0.org/gdb/event-top.c Tue Sep 5 19:34:20 2000
88 +++ gdb-5.0/gdb/event-top.c Tue Sep 5 19:34:42 2000
92 /* readline include files */
94 #include <readline/readline.h>
95 #include <readline/history.h>
97 diff -urN gdb-5.0.org/gdb/gdbserver/Makefile.in gdb-5.0/gdb/gdbserver/Makefile.in
98 --- gdb-5.0.org/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:00 2000
99 +++ gdb-5.0/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:35 2000
102 # Where is the source dir for the READLINE library? Traditionally in .. or .
103 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
104 -READLINE_DIR = ${srcdir}/../readline
105 +READLINE_DIR = /usr/lib
106 READLINE_DEP = $$(READLINE_DIR)
108 # All the includes used for CFLAGS and for lint.
109 diff -urN gdb-5.0.org/gdb/top.c gdb-5.0/gdb/top.c
110 --- gdb-5.0.org/gdb/top.c Wed Apr 12 18:46:03 2000
111 +++ gdb-5.0/gdb/top.c Tue Sep 5 19:45:56 2000
115 /* readline include files */
117 #include <readline/readline.h>
118 #include <readline/history.h>
120 diff -urN gdb-5.0.org/gdb/tracepoint.c gdb-5.0/gdb/tracepoint.c
121 --- gdb-5.0.org/gdb/tracepoint.c Tue Dec 14 02:05:38 1999
122 +++ gdb-5.0/gdb/tracepoint.c Tue Sep 5 19:38:26 2000
126 /* readline include files */
128 #include <readline/readline.h>
129 #include <readline/history.h>
131 diff -urN gdb-5.0.org/gdb/tui/Makefile.in gdb-5.0/gdb/tui/Makefile.in
132 --- gdb-5.0.org/gdb/tui/Makefile.in Tue Sep 5 18:30:00 2000
133 +++ gdb-5.0/gdb/tui/Makefile.in Tue Sep 5 18:28:16 2000
135 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
137 # Where is the READLINE library? Typically in ../readline.
138 -READLINE_DIR = ../../readline
139 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
140 -READLINE_CFLAGS = -I$(READLINE_SRC)
141 +READLINE_DIR = /usr/lib
142 +READLINE_SRC = /usr/lib
143 +READLINE_CFLAGS = -I/usr/include/readline
145 # Where is the INTL library? Typically in ../intl.
146 INTL_DIR = ../../intl
147 diff -urN gdb-5.0.org/gdb/utils.c gdb-5.0/gdb/utils.c
148 --- gdb-5.0.org/gdb/utils.c Tue Sep 5 18:54:25 2000
149 +++ gdb-5.0/gdb/utils.c Tue Sep 5 19:49:03 2000
151 #include "language.h"
152 #include "annotate.h"
155 #include <readline/readline.h>
158 --- gdb-5.0/gdb/defs.h.wiget Fri Apr 13 14:59:59 2001
159 +++ gdb-5.0/gdb/defs.h Fri Apr 13 15:00:09 2001
162 /* From readline (but not in any readline .h files). */
164 -extern char *tilde_expand (char *);
165 +extern char *tilde_expand (const char *);
167 /* Control types for commands */