]>
Commit | Line | Data |
---|---|---|
2ee06e07 AM |
1 | diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in |
2 | --- gdb-6.0.org/gdb/gdbserver/Makefile.in 2003-10-09 19:42:41.000000000 +0200 | |
3 | +++ gdb-6.0/gdb/gdbserver/Makefile.in 2003-10-09 19:48:08.000000000 +0200 | |
4 | @@ -76,7 +76,7 @@ | |
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. | |
13 | diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in | |
14 | --- gdb-6.0.org/gdb/Makefile.in 2003-10-09 19:42:39.000000000 +0200 | |
15 | +++ gdb-6.0/gdb/Makefile.in 2003-10-09 19:48:08.000000000 +0200 | |
16 | @@ -116,10 +116,10 @@ | |
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 | |
21 | -READLINE = $(READLINE_DIR)/libreadline.a | |
22 | -READLINE_SRC = $(srcdir)/$(READLINE_DIR) | |
23 | -READLINE_CFLAGS = -I$(READLINE_SRC)/.. | |
24 | +READLINE_DIR = /usr/include/readline | |
25 | +READLINE = -lreadline | |
26 | +READLINE_SRC = /usr/include/readline | |
27 | +READLINE_CFLAGS = -I/usr/include/readline | |
28 | ||
29 | WARN_CFLAGS = @WARN_CFLAGS@ | |
30 | WERROR_CFLAGS = @WERROR_CFLAGS@ | |
b7499d66 PS |
31 | @@ -369,7 +369,7 @@ |
32 | $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \ | |
33 | $(LIBICONV) \ | |
34 | $(LIBIBERTY) $(WIN32LIBS) | |
35 | -CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \ | |
36 | +CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \ | |
37 | $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) | |
38 | ||
39 | ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) | |
2ebec1f7 JB |
40 | --- gdb-6.5/Makefile.in.orig 2006-06-21 07:14:44.000000000 +0200 |
41 | +++ gdb-6.5/Makefile.in 2006-06-22 15:57:50.144440000 +0200 | |
42 | @@ -598,7 +598,6 @@ | |
2ee06e07 AM |
43 | maybe-configure-perl \ |
44 | maybe-configure-prms \ | |
45 | maybe-configure-rcs \ | |
46 | - maybe-configure-readline \ | |
47 | maybe-configure-release \ | |
48 | maybe-configure-recode \ | |
49 | maybe-configure-sed \ | |
2ebec1f7 JB |
50 | @@ -740,7 +739,6 @@ |
51 | all-host: maybe-all-perl | |
52 | all-host: maybe-all-prms | |
53 | all-host: maybe-all-rcs | |
54 | -all-host: maybe-all-readline | |
55 | all-host: maybe-all-release | |
56 | all-host: maybe-all-recode | |
57 | all-host: maybe-all-sed | |
58 | @@ -851,7 +849,6 @@ | |
59 | info-host: maybe-info-perl | |
60 | info-host: maybe-info-prms | |
61 | info-host: maybe-info-rcs | |
62 | -info-host: maybe-info-readline | |
63 | info-host: maybe-info-release | |
64 | info-host: maybe-info-recode | |
65 | info-host: maybe-info-sed | |
66 | @@ -955,7 +952,6 @@ | |
67 | dvi-host: maybe-dvi-perl | |
68 | dvi-host: maybe-dvi-prms | |
69 | dvi-host: maybe-dvi-rcs | |
70 | -dvi-host: maybe-dvi-readline | |
71 | dvi-host: maybe-dvi-release | |
72 | dvi-host: maybe-dvi-recode | |
73 | dvi-host: maybe-dvi-sed | |
74 | @@ -1059,7 +1055,6 @@ | |
75 | html-host: maybe-html-perl | |
76 | html-host: maybe-html-prms | |
77 | html-host: maybe-html-rcs | |
78 | -html-host: maybe-html-readline | |
79 | html-host: maybe-html-release | |
80 | html-host: maybe-html-recode | |
81 | html-host: maybe-html-sed | |
82 | @@ -1163,7 +1158,6 @@ | |
83 | TAGS-host: maybe-TAGS-perl | |
84 | TAGS-host: maybe-TAGS-prms | |
85 | TAGS-host: maybe-TAGS-rcs | |
86 | -TAGS-host: maybe-TAGS-readline | |
87 | TAGS-host: maybe-TAGS-release | |
88 | TAGS-host: maybe-TAGS-recode | |
89 | TAGS-host: maybe-TAGS-sed | |
90 | @@ -1267,7 +1261,6 @@ | |
91 | install-info-host: maybe-install-info-perl | |
92 | install-info-host: maybe-install-info-prms | |
93 | install-info-host: maybe-install-info-rcs | |
94 | -install-info-host: maybe-install-info-readline | |
95 | install-info-host: maybe-install-info-release | |
96 | install-info-host: maybe-install-info-recode | |
97 | install-info-host: maybe-install-info-sed | |
98 | @@ -1371,7 +1364,6 @@ | |
99 | install-html-host: maybe-install-html-perl | |
100 | install-html-host: maybe-install-html-prms | |
101 | install-html-host: maybe-install-html-rcs | |
102 | -install-html-host: maybe-install-html-readline | |
103 | install-html-host: maybe-install-html-release | |
104 | install-html-host: maybe-install-html-recode | |
105 | install-html-host: maybe-install-html-sed | |
106 | @@ -1475,7 +1467,6 @@ | |
107 | installcheck-host: maybe-installcheck-perl | |
108 | installcheck-host: maybe-installcheck-prms | |
109 | installcheck-host: maybe-installcheck-rcs | |
110 | -installcheck-host: maybe-installcheck-readline | |
111 | installcheck-host: maybe-installcheck-release | |
112 | installcheck-host: maybe-installcheck-recode | |
113 | installcheck-host: maybe-installcheck-sed | |
114 | @@ -1579,7 +1570,6 @@ | |
115 | mostlyclean-host: maybe-mostlyclean-perl | |
116 | mostlyclean-host: maybe-mostlyclean-prms | |
117 | mostlyclean-host: maybe-mostlyclean-rcs | |
118 | -mostlyclean-host: maybe-mostlyclean-readline | |
119 | mostlyclean-host: maybe-mostlyclean-release | |
120 | mostlyclean-host: maybe-mostlyclean-recode | |
121 | mostlyclean-host: maybe-mostlyclean-sed | |
122 | @@ -1683,7 +1673,6 @@ | |
123 | clean-host: maybe-clean-perl | |
124 | clean-host: maybe-clean-prms | |
125 | clean-host: maybe-clean-rcs | |
126 | -clean-host: maybe-clean-readline | |
127 | clean-host: maybe-clean-release | |
128 | clean-host: maybe-clean-recode | |
129 | clean-host: maybe-clean-sed | |
130 | @@ -1787,7 +1776,6 @@ | |
131 | distclean-host: maybe-distclean-perl | |
132 | distclean-host: maybe-distclean-prms | |
133 | distclean-host: maybe-distclean-rcs | |
134 | -distclean-host: maybe-distclean-readline | |
135 | distclean-host: maybe-distclean-release | |
136 | distclean-host: maybe-distclean-recode | |
137 | distclean-host: maybe-distclean-sed | |
138 | @@ -1891,7 +1879,6 @@ | |
139 | maintainer-clean-host: maybe-maintainer-clean-perl | |
140 | maintainer-clean-host: maybe-maintainer-clean-prms | |
141 | maintainer-clean-host: maybe-maintainer-clean-rcs | |
142 | -maintainer-clean-host: maybe-maintainer-clean-readline | |
143 | maintainer-clean-host: maybe-maintainer-clean-release | |
144 | maintainer-clean-host: maybe-maintainer-clean-recode | |
145 | maintainer-clean-host: maybe-maintainer-clean-sed | |
146 | @@ -2050,7 +2037,6 @@ | |
2ee06e07 AM |
147 | maybe-check-perl \ |
148 | maybe-check-prms \ | |
149 | maybe-check-rcs \ | |
150 | - maybe-check-readline \ | |
151 | maybe-check-release \ | |
152 | maybe-check-recode \ | |
153 | maybe-check-sed \ | |
2ebec1f7 | 154 | @@ -2180,7 +2166,6 @@ |
2ee06e07 AM |
155 | maybe-install-perl \ |
156 | maybe-install-prms \ | |
157 | maybe-install-rcs \ | |
158 | - maybe-install-readline \ | |
159 | maybe-install-release \ | |
160 | maybe-install-recode \ | |
161 | maybe-install-sed \ | |
2ebec1f7 | 162 | @@ -2251,7 +2236,6 @@ |
2ee06e07 AM |
163 | maybe-install-perl \ |
164 | maybe-install-prms \ | |
165 | maybe-install-rcs \ | |
166 | - maybe-install-readline \ | |
167 | maybe-install-release \ | |
168 | maybe-install-recode \ | |
169 | maybe-install-sed \ | |
2ebec1f7 | 170 | @@ -40764,7 +40748,6 @@ |
b3d93c17 JB |
171 | all-gdb: maybe-all-libiberty |
172 | all-gdb: maybe-all-opcodes | |
173 | all-gdb: maybe-all-bfd | |
174 | -all-gdb: maybe-all-readline | |
175 | all-gdb: maybe-all-build-bison | |
176 | all-gdb: maybe-all-build-byacc | |
177 | all-gdb: maybe-all-sim | |
2ebec1f7 | 178 | @@ -40993,7 +40976,6 @@ |
b3d93c17 JB |
179 | all-sim: maybe-all-libiberty |
180 | all-sim: maybe-all-bfd | |
181 | all-sim: maybe-all-opcodes | |
182 | -all-sim: maybe-all-readline | |
183 | all-sim: maybe-configure-gdb | |
184 | all-fastjar: maybe-all-zlib | |
185 | all-fastjar: maybe-all-build-texinfo |