3 @@ -15590,236 +15590,40 @@ maintainer-clean-rcs:
6 .PHONY: configure-readline maybe-configure-readline
7 -maybe-configure-readline:
9 -maybe-configure-readline: configure-readline
11 - @test ! -f readline/Makefile || exit 0; \
12 - [ -d readline ] || mkdir readline; \
13 - r=`${PWD_COMMAND}`; export r; \
14 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
16 - echo Configuring in readline; \
17 - cd readline || exit 1; \
20 - srcdiroption="--srcdir=."; \
22 - /* | [A-Za-z]:[\\/]*) \
23 - srcdiroption="--srcdir=$(srcdir)/readline"; \
24 - libsrcdir="$$s/readline";; \
26 - srcdiroption="--srcdir=../$(srcdir)/readline"; \
27 - libsrcdir="$$s/readline";; \
29 - $(SHELL) $${libsrcdir}/configure \
30 - $(HOST_CONFIGARGS) $${srcdiroption} \
33 +maybe-configure-readline: ;
35 .PHONY: all-readline maybe-all-readline
39 -maybe-all-readline: all-readline
40 -all-readline: configure-readline
41 - @r=`${PWD_COMMAND}`; export r; \
42 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
45 - (cd readline && $(MAKE) $(FLAGS_TO_PASS) \
48 +maybe-all-readline: ;
50 .PHONY: check-readline maybe-check-readline
51 -maybe-check-readline:
53 -maybe-check-readline: check-readline
56 - @r=`${PWD_COMMAND}`; export r; \
57 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
60 - (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
63 +maybe-check-readline: ;
65 .PHONY: install-readline maybe-install-readline
66 -maybe-install-readline:
68 -maybe-install-readline: install-readline
70 -install-readline: installdirs
71 - @r=`${PWD_COMMAND}`; export r; \
72 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
75 - (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
78 +maybe-install-readline: ;
80 # Other targets (info, dvi, etc.)
82 .PHONY: maybe-info-readline info-readline
85 -maybe-info-readline: info-readline
89 - @[ -f ./readline/Makefile ] || exit 0; \
90 - r=`${PWD_COMMAND}`; export r; \
91 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
94 - for flag in $(EXTRA_HOST_FLAGS) ; do \
95 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
97 - echo "Doing info in readline" ; \
99 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
100 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
101 - "RANLIB=$${RANLIB}" \
102 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
107 +maybe-info-readline: ;
109 .PHONY: maybe-dvi-readline dvi-readline
112 -maybe-dvi-readline: dvi-readline
116 - @[ -f ./readline/Makefile ] || exit 0; \
117 - r=`${PWD_COMMAND}`; export r; \
118 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
121 - for flag in $(EXTRA_HOST_FLAGS) ; do \
122 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
124 - echo "Doing dvi in readline" ; \
126 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
127 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
128 - "RANLIB=$${RANLIB}" \
129 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
134 +maybe-dvi-readline: ;
136 .PHONY: maybe-TAGS-readline TAGS-readline
137 -maybe-TAGS-readline:
139 -maybe-TAGS-readline: TAGS-readline
143 - @[ -f ./readline/Makefile ] || exit 0; \
144 - r=`${PWD_COMMAND}`; export r; \
145 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
148 - for flag in $(EXTRA_HOST_FLAGS) ; do \
149 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
151 - echo "Doing TAGS in readline" ; \
153 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
154 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
155 - "RANLIB=$${RANLIB}" \
156 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
161 +maybe-TAGS-readline: ;
163 .PHONY: maybe-install-info-readline install-info-readline
164 -maybe-install-info-readline:
166 -maybe-install-info-readline: install-info-readline
168 -install-info-readline: \
169 - configure-readline \
171 - @[ -f ./readline/Makefile ] || exit 0; \
172 - r=`${PWD_COMMAND}`; export r; \
173 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
176 - for flag in $(EXTRA_HOST_FLAGS) ; do \
177 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
179 - echo "Doing install-info in readline" ; \
181 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
182 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
183 - "RANLIB=$${RANLIB}" \
184 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
189 +maybe-install-info-readline: ;
191 .PHONY: maybe-installcheck-readline installcheck-readline
192 -maybe-installcheck-readline:
194 -maybe-installcheck-readline: installcheck-readline
196 -installcheck-readline: \
198 - @[ -f ./readline/Makefile ] || exit 0; \
199 - r=`${PWD_COMMAND}`; export r; \
200 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
203 - for flag in $(EXTRA_HOST_FLAGS) ; do \
204 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
206 - echo "Doing installcheck in readline" ; \
208 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
209 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
210 - "RANLIB=$${RANLIB}" \
211 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
216 +maybe-installcheck-readline: ;
218 .PHONY: maybe-mostlyclean-readline mostlyclean-readline
219 -maybe-mostlyclean-readline:
221 -maybe-mostlyclean-readline: mostlyclean-readline
223 -mostlyclean-readline:
224 - @[ -f ./readline/Makefile ] || exit 0; \
225 - r=`${PWD_COMMAND}`; export r; \
226 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
229 - for flag in $(EXTRA_HOST_FLAGS) ; do \
230 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
232 - echo "Doing mostlyclean in readline" ; \
234 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
235 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
236 - "RANLIB=$${RANLIB}" \
237 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
242 +maybe-mostlyclean-readline: ;
244 .PHONY: maybe-clean-readline clean-readline
245 -maybe-clean-readline:
247 +maybe-clean-readline: ;
248 +@if readline-disabled
249 maybe-clean-readline: clean-readline
252 @@ -15844,53 +15648,9 @@ clean-readline:
254 .PHONY: maybe-distclean-readline distclean-readline
255 maybe-distclean-readline:
257 -maybe-distclean-readline: distclean-readline
260 - @[ -f ./readline/Makefile ] || exit 0; \
261 - r=`${PWD_COMMAND}`; export r; \
262 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
265 - for flag in $(EXTRA_HOST_FLAGS) ; do \
266 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
268 - echo "Doing distclean in readline" ; \
270 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
271 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
272 - "RANLIB=$${RANLIB}" \
273 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
279 .PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
280 -maybe-maintainer-clean-readline:
282 -maybe-maintainer-clean-readline: maintainer-clean-readline
284 -maintainer-clean-readline:
285 - @[ -f ./readline/Makefile ] || exit 0; \
286 - r=`${PWD_COMMAND}`; export r; \
287 - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
290 - for flag in $(EXTRA_HOST_FLAGS) ; do \
291 - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
293 - echo "Doing maintainer-clean in readline" ; \
295 - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
296 - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
297 - "RANLIB=$${RANLIB}" \
298 - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
299 - maintainer-clean) \
303 +maybe-maintainer-clean-readline: ;
306 .PHONY: configure-release maybe-configure-release
307 --- a/gdb/Makefile.in
308 +++ b/gdb/Makefile.in
309 @@ -121,10 +121,10 @@ BFD_SRC = $(srcdir)/$(BFD_DIR)
310 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
312 # Where is the READLINE library? Typically in ../readline.
313 -READLINE_DIR = ../readline
314 -READLINE = $(READLINE_DIR)/libreadline.a
316 READLINE_SRC = $(srcdir)/$(READLINE_DIR)
317 -READLINE_CFLAGS = -I$(READLINE_SRC)/..
319 +READLINE_LDFLAGS = -lreadline
321 WARN_CFLAGS = @WARN_CFLAGS@
322 WERROR_CFLAGS = @WERROR_CFLAGS@