]>
Commit | Line | Data |
---|---|---|
3e054f6c AM |
1 | diff -ur gdb-6.7.org/gdb/gdbserver/Makefile.in gdb-6.7/gdb/gdbserver/Makefile.in |
2 | --- gdb-6.7.org/gdb/gdbserver/Makefile.in 2007-06-13 20:50:38.000000000 +0200 | |
3 | +++ gdb-6.7/gdb/gdbserver/Makefile.in 2007-10-10 21:10:05.379655356 +0200 | |
4 | @@ -78,7 +78,7 @@ | |
2ee06e07 AM |
5 | |
6 | # Where is the source dir for the READLINE library? Traditionally in .. or . | |
7 | # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.) | |
8 | -READLINE_DIR = ${srcdir}/../readline | |
9 | +READLINE_DIR = /usr/lib | |
10 | READLINE_DEP = $$(READLINE_DIR) | |
11 | ||
12 | # All the includes used for CFLAGS and for lint. | |
3e054f6c AM |
13 | diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in |
14 | --- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200 | |
15 | +++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200 | |
16 | @@ -126,11 +126,11 @@ | |
de7d4c89 AM |
17 | BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) |
18 | ||
19 | # Where is the READLINE library? Typically in ../readline. | |
20 | -READLINE_DIR = ../readline | |
de7d4c89 | 21 | -READLINE_SRC = $(srcdir)/$(READLINE_DIR) |
3e054f6c AM |
22 | -READLINE = @READLINE@ |
23 | -READLINE_DEPS = @READLINE_DEPS@ | |
24 | -READLINE_CFLAGS = @READLINE_CFLAGS@ | |
de7d4c89 AM |
25 | +READLINE_DIR = /usr/include/readline |
26 | +READLINE = -lreadline | |
27 | +READLINE_SRC = /usr/include/readline | |
3e054f6c | 28 | +READLINE_DEPS = |
de7d4c89 AM |
29 | +READLINE_CFLAGS = -I/usr/include/readline |
30 | ||
3e054f6c AM |
31 | # Where is expat? This will be empty if expat was not available. |
32 | LIBEXPAT = @LIBEXPAT@ | |
33 | @@ -388,7 +388,7 @@ | |
b7499d66 | 34 | $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ |
3e054f6c | 35 | $(LIBICONV) $(LIBEXPAT) \ |
b7499d66 | 36 | $(LIBIBERTY) $(WIN32LIBS) |
3e054f6c | 37 | -CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ |
b7499d66 PS |
38 | +CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \ |
39 | $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) | |
40 | ||
41 | ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) | |
3e054f6c AM |
42 | diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in |
43 | --- gdb-6.7.org/Makefile.in 2007-10-10 19:09:32.000000000 +0200 | |
44 | +++ gdb-6.7/Makefile.in 2007-10-10 21:10:23.310556251 +0200 | |
45 | @@ -664,7 +664,6 @@ | |
2ee06e07 AM |
46 | maybe-configure-perl \ |
47 | maybe-configure-prms \ | |
48 | maybe-configure-rcs \ | |
49 | - maybe-configure-readline \ | |
50 | maybe-configure-release \ | |
51 | maybe-configure-recode \ | |
52 | maybe-configure-sed \ | |
3e054f6c | 53 | @@ -812,7 +811,6 @@ |
2ebec1f7 JB |
54 | all-host: maybe-all-perl |
55 | all-host: maybe-all-prms | |
56 | all-host: maybe-all-rcs | |
57 | -all-host: maybe-all-readline | |
58 | all-host: maybe-all-release | |
59 | all-host: maybe-all-recode | |
60 | all-host: maybe-all-sed | |
3e054f6c | 61 | @@ -927,7 +925,6 @@ |
2ebec1f7 JB |
62 | info-host: maybe-info-perl |
63 | info-host: maybe-info-prms | |
64 | info-host: maybe-info-rcs | |
65 | -info-host: maybe-info-readline | |
66 | info-host: maybe-info-release | |
67 | info-host: maybe-info-recode | |
68 | info-host: maybe-info-sed | |
3e054f6c | 69 | @@ -1033,7 +1030,6 @@ |
2ebec1f7 JB |
70 | dvi-host: maybe-dvi-perl |
71 | dvi-host: maybe-dvi-prms | |
72 | dvi-host: maybe-dvi-rcs | |
73 | -dvi-host: maybe-dvi-readline | |
74 | dvi-host: maybe-dvi-release | |
75 | dvi-host: maybe-dvi-recode | |
76 | dvi-host: maybe-dvi-sed | |
3e054f6c | 77 | @@ -1245,7 +1241,6 @@ |
2ebec1f7 JB |
78 | html-host: maybe-html-perl |
79 | html-host: maybe-html-prms | |
80 | html-host: maybe-html-rcs | |
81 | -html-host: maybe-html-readline | |
82 | html-host: maybe-html-release | |
83 | html-host: maybe-html-recode | |
84 | html-host: maybe-html-sed | |
3e054f6c | 85 | @@ -1351,7 +1346,6 @@ |
2ebec1f7 JB |
86 | TAGS-host: maybe-TAGS-perl |
87 | TAGS-host: maybe-TAGS-prms | |
88 | TAGS-host: maybe-TAGS-rcs | |
89 | -TAGS-host: maybe-TAGS-readline | |
90 | TAGS-host: maybe-TAGS-release | |
91 | TAGS-host: maybe-TAGS-recode | |
92 | TAGS-host: maybe-TAGS-sed | |
3e054f6c | 93 | @@ -1457,7 +1451,6 @@ |
2ebec1f7 JB |
94 | install-info-host: maybe-install-info-perl |
95 | install-info-host: maybe-install-info-prms | |
96 | install-info-host: maybe-install-info-rcs | |
97 | -install-info-host: maybe-install-info-readline | |
98 | install-info-host: maybe-install-info-release | |
99 | install-info-host: maybe-install-info-recode | |
100 | install-info-host: maybe-install-info-sed | |
3e054f6c | 101 | @@ -1669,7 +1662,6 @@ |
2ebec1f7 JB |
102 | install-html-host: maybe-install-html-perl |
103 | install-html-host: maybe-install-html-prms | |
104 | install-html-host: maybe-install-html-rcs | |
105 | -install-html-host: maybe-install-html-readline | |
106 | install-html-host: maybe-install-html-release | |
107 | install-html-host: maybe-install-html-recode | |
108 | install-html-host: maybe-install-html-sed | |
3e054f6c | 109 | @@ -1775,7 +1767,6 @@ |
2ebec1f7 JB |
110 | installcheck-host: maybe-installcheck-perl |
111 | installcheck-host: maybe-installcheck-prms | |
112 | installcheck-host: maybe-installcheck-rcs | |
113 | -installcheck-host: maybe-installcheck-readline | |
114 | installcheck-host: maybe-installcheck-release | |
115 | installcheck-host: maybe-installcheck-recode | |
116 | installcheck-host: maybe-installcheck-sed | |
3e054f6c | 117 | @@ -1881,7 +1872,6 @@ |
2ebec1f7 JB |
118 | mostlyclean-host: maybe-mostlyclean-perl |
119 | mostlyclean-host: maybe-mostlyclean-prms | |
120 | mostlyclean-host: maybe-mostlyclean-rcs | |
121 | -mostlyclean-host: maybe-mostlyclean-readline | |
122 | mostlyclean-host: maybe-mostlyclean-release | |
123 | mostlyclean-host: maybe-mostlyclean-recode | |
124 | mostlyclean-host: maybe-mostlyclean-sed | |
3e054f6c | 125 | @@ -1987,7 +1977,6 @@ |
2ebec1f7 JB |
126 | clean-host: maybe-clean-perl |
127 | clean-host: maybe-clean-prms | |
128 | clean-host: maybe-clean-rcs | |
129 | -clean-host: maybe-clean-readline | |
130 | clean-host: maybe-clean-release | |
131 | clean-host: maybe-clean-recode | |
132 | clean-host: maybe-clean-sed | |
3e054f6c | 133 | @@ -2093,7 +2082,6 @@ |
2ebec1f7 JB |
134 | distclean-host: maybe-distclean-perl |
135 | distclean-host: maybe-distclean-prms | |
136 | distclean-host: maybe-distclean-rcs | |
137 | -distclean-host: maybe-distclean-readline | |
138 | distclean-host: maybe-distclean-release | |
139 | distclean-host: maybe-distclean-recode | |
140 | distclean-host: maybe-distclean-sed | |
3e054f6c | 141 | @@ -2199,7 +2187,6 @@ |
2ebec1f7 JB |
142 | maintainer-clean-host: maybe-maintainer-clean-perl |
143 | maintainer-clean-host: maybe-maintainer-clean-prms | |
144 | maintainer-clean-host: maybe-maintainer-clean-rcs | |
145 | -maintainer-clean-host: maybe-maintainer-clean-readline | |
146 | maintainer-clean-host: maybe-maintainer-clean-release | |
147 | maintainer-clean-host: maybe-maintainer-clean-recode | |
148 | maintainer-clean-host: maybe-maintainer-clean-sed | |
3e054f6c | 149 | @@ -2359,7 +2346,6 @@ |
2ee06e07 AM |
150 | maybe-check-perl \ |
151 | maybe-check-prms \ | |
152 | maybe-check-rcs \ | |
153 | - maybe-check-readline \ | |
154 | maybe-check-release \ | |
155 | maybe-check-recode \ | |
156 | maybe-check-sed \ | |
3e054f6c | 157 | @@ -2491,7 +2477,6 @@ |
2ee06e07 AM |
158 | maybe-install-perl \ |
159 | maybe-install-prms \ | |
160 | maybe-install-rcs \ | |
161 | - maybe-install-readline \ | |
162 | maybe-install-release \ | |
163 | maybe-install-recode \ | |
164 | maybe-install-sed \ | |
3e054f6c | 165 | @@ -2564,7 +2549,6 @@ |
2ee06e07 AM |
166 | maybe-install-perl \ |
167 | maybe-install-prms \ | |
168 | maybe-install-rcs \ | |
169 | - maybe-install-readline \ | |
170 | maybe-install-release \ | |
171 | maybe-install-recode \ | |
172 | maybe-install-sed \ | |
3e054f6c AM |
173 | @@ -51494,7 +51478,6 @@ |
174 | all-gdb: maybe-all-intl | |
b3d93c17 JB |
175 | all-gdb: maybe-all-libiberty |
176 | all-gdb: maybe-all-opcodes | |
b3d93c17 JB |
177 | -all-gdb: maybe-all-readline |
178 | all-gdb: maybe-all-build-bison | |
179 | all-gdb: maybe-all-build-byacc | |
180 | all-gdb: maybe-all-sim | |
3e054f6c | 181 | @@ -51826,7 +51809,6 @@ |
b3d93c17 JB |
182 | all-sim: maybe-all-libiberty |
183 | all-sim: maybe-all-bfd | |
184 | all-sim: maybe-all-opcodes | |
185 | -all-sim: maybe-all-readline | |
186 | all-sim: maybe-configure-gdb | |
187 | all-fastjar: maybe-all-zlib | |
188 | all-fastjar: maybe-all-build-texinfo |