[packages/gdb.git] / gdb-readline.patch

diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in
--- gdb-6.0.org/gdb/gdbserver/Makefile.in	2003-10-09 19:42:41.000000000 +0200
+++ gdb-6.0/gdb/gdbserver/Makefile.in	2003-10-09 19:48:08.000000000 +0200
@@ -76,7 +76,7 @@
 
 # Where is the source dir for the READLINE library?  Traditionally in .. or .
 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
-READLINE_DIR = ${srcdir}/../readline
+READLINE_DIR = /usr/lib
 READLINE_DEP = $$(READLINE_DIR)
 
 # All the includes used for CFLAGS and for lint.
diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in
--- gdb-6.0.org/gdb/Makefile.in	2003-10-09 19:42:39.000000000 +0200
+++ gdb-6.0/gdb/Makefile.in	2003-10-09 19:48:08.000000000 +0200
@@ -116,10 +116,10 @@
 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
 
 # Where is the READLINE library?  Typically in ../readline.
-READLINE_DIR = ../readline
-READLINE = $(READLINE_DIR)/libreadline.a
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
-READLINE_CFLAGS = -I$(READLINE_SRC)/..
+READLINE_DIR = /usr/include/readline
+READLINE = -lreadline
+READLINE_SRC = /usr/include/readline
+READLINE_CFLAGS = -I/usr/include/readline
 
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
--- gdb-6.1/Makefile.in.orig	2004-04-03 18:52:09.000000000 +0200
+++ gdb-6.1/Makefile.in	2004-04-17 22:43:50.603804248 +0200
@@ -571,7 +571,6 @@
     maybe-configure-perl \
     maybe-configure-prms \
     maybe-configure-rcs \
-    maybe-configure-readline \
     maybe-configure-release \
     maybe-configure-recode \
     maybe-configure-sed \
@@ -661,7 +660,6 @@
     maybe-all-perl \
     maybe-all-prms \
     maybe-all-rcs \
-    maybe-all-readline \
     maybe-all-release \
     maybe-all-recode \
     maybe-all-sed \
@@ -755,7 +753,6 @@
     maybe-info-perl \
     maybe-info-prms \
     maybe-info-rcs \
-    maybe-info-readline \
     maybe-info-release \
     maybe-info-recode \
     maybe-info-sed \
@@ -1724,28 +1721,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-info-readline info-readline
-maybe-info-readline:
-
-info-readline: \
-    configure-readline 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-
 .PHONY: maybe-info-release info-release
 maybe-info-release:
 
@@ -2654,7 +2629,6 @@
     maybe-dvi-perl \
     maybe-dvi-prms \
     maybe-dvi-rcs \
-    maybe-dvi-readline \
     maybe-dvi-release \
     maybe-dvi-recode \
     maybe-dvi-sed \
@@ -3623,28 +3597,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-dvi-readline dvi-readline
-maybe-dvi-readline:
-
-dvi-readline: \
-    configure-readline 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-
 .PHONY: maybe-dvi-release dvi-release
 maybe-dvi-release:
 
@@ -4553,7 +4505,6 @@
     maybe-TAGS-perl \
     maybe-TAGS-prms \
     maybe-TAGS-rcs \
-    maybe-TAGS-readline \
     maybe-TAGS-release \
     maybe-TAGS-recode \
     maybe-TAGS-sed \
@@ -5522,28 +5473,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
-
-TAGS-readline: \
-    configure-readline 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-
 .PHONY: maybe-TAGS-release TAGS-release
 maybe-TAGS-release:
 
@@ -6452,7 +6381,6 @@
     maybe-install-info-perl \
     maybe-install-info-prms \
     maybe-install-info-rcs \
-    maybe-install-info-readline \
     maybe-install-info-release \
     maybe-install-info-recode \
     maybe-install-info-sed \
@@ -7463,29 +7391,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
-
-install-info-readline: \
-    configure-readline \
-    info-readline 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-
 .PHONY: maybe-install-info-release install-info-release
 maybe-install-info-release:
 
@@ -8433,7 +8338,6 @@
     maybe-installcheck-perl \
     maybe-installcheck-prms \
     maybe-installcheck-rcs \
-    maybe-installcheck-readline \
     maybe-installcheck-release \
     maybe-installcheck-recode \
     maybe-installcheck-sed \
@@ -9402,28 +9306,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-installcheck-readline installcheck-readline
-maybe-installcheck-readline:
-
-installcheck-readline: \
-    configure-readline 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-
 .PHONY: maybe-installcheck-release installcheck-release
 maybe-installcheck-release:
 
@@ -10332,7 +10214,6 @@
     maybe-mostlyclean-perl \
     maybe-mostlyclean-prms \
     maybe-mostlyclean-rcs \
-    maybe-mostlyclean-readline \
     maybe-mostlyclean-release \
     maybe-mostlyclean-recode \
     maybe-mostlyclean-sed \
@@ -11245,27 +11126,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
-maybe-mostlyclean-readline:
-
-mostlyclean-readline: 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-
 .PHONY: maybe-mostlyclean-release mostlyclean-release
 maybe-mostlyclean-release:
 
@@ -12107,7 +11967,6 @@
     maybe-clean-perl \
     maybe-clean-prms \
     maybe-clean-rcs \
-    maybe-clean-readline \
     maybe-clean-release \
     maybe-clean-recode \
     maybe-clean-sed \
@@ -13034,27 +12893,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-clean-readline clean-readline
-maybe-clean-readline:
-
-clean-readline: 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-
 .PHONY: maybe-clean-release clean-release
 maybe-clean-release:
 
@@ -13896,7 +13734,6 @@
     maybe-distclean-perl \
     maybe-distclean-prms \
     maybe-distclean-rcs \
-    maybe-distclean-readline \
     maybe-distclean-release \
     maybe-distclean-recode \
     maybe-distclean-sed \
@@ -14823,27 +14660,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-distclean-readline distclean-readline
-maybe-distclean-readline:
-
-distclean-readline: 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-
 .PHONY: maybe-distclean-release distclean-release
 maybe-distclean-release:
 
@@ -15685,7 +15501,6 @@
     maybe-maintainer-clean-perl \
     maybe-maintainer-clean-prms \
     maybe-maintainer-clean-rcs \
-    maybe-maintainer-clean-readline \
     maybe-maintainer-clean-release \
     maybe-maintainer-clean-recode \
     maybe-maintainer-clean-sed \
@@ -16612,27 +16427,6 @@
 	  || exit 1
 
 
-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
-maybe-maintainer-clean-readline:
-
-maintainer-clean-readline: 
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	for flag in $(EXTRA_HOST_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in readline" ; \
-	(cd readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-
 .PHONY: maybe-maintainer-clean-release maintainer-clean-release
 maybe-maintainer-clean-release:
 
@@ -17531,7 +17325,6 @@
     maybe-check-perl \
     maybe-check-prms \
     maybe-check-rcs \
-    maybe-check-readline \
     maybe-check-release \
     maybe-check-recode \
     maybe-check-sed \
@@ -17641,7 +17434,6 @@
     maybe-install-perl \
     maybe-install-prms \
     maybe-install-rcs \
-    maybe-install-readline \
     maybe-install-release \
     maybe-install-recode \
     maybe-install-sed \
@@ -17708,7 +17500,6 @@
     maybe-install-perl \
     maybe-install-prms \
     maybe-install-rcs \
-    maybe-install-readline \
     maybe-install-release \
     maybe-install-recode \
     maybe-install-sed \
@@ -20631,73 +20422,6 @@
 	(cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
-.PHONY: configure-readline maybe-configure-readline
-maybe-configure-readline:
-configure-readline:
-	@test ! -f readline/Makefile || exit 0; \
-	[ -d readline ] || mkdir readline; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	CC="$(CC)"; export CC; \
-	CFLAGS="$(CFLAGS)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CXX="$(CXX)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-	AR="$(AR)"; export AR; \
-	AS="$(AS)"; export AS; \
-	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-	DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-	LD="$(LD)"; export LD; \
-	NM="$(NM)"; export NM; \
-	RANLIB="$(RANLIB)"; export RANLIB; \
-	WINDRES="$(WINDRES)"; export WINDRES; \
-	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	echo Configuring in readline; \
-	cd readline || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/readline"; \
-	    libsrcdir="$$s/readline";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/readline"; \
-	    libsrcdir="$$s/readline";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  || exit 1
-
-.PHONY: all-readline maybe-all-readline
-maybe-all-readline:
-all-readline: configure-readline
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	(cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
-
-.PHONY: check-readline maybe-check-readline
-maybe-check-readline:
-
-check-readline:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	(cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-.PHONY: install-readline maybe-install-readline
-maybe-install-readline:
-
-install-readline: installdirs
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	(cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
 .PHONY: configure-release maybe-configure-release
 maybe-configure-release:
 configure-release:
@@ -23771,7 +23495,7 @@
 # GDB needs to know that the simulator is being built.
 configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
 GDB_TK = @GDB_TK@
-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
 install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
 configure-libgui: maybe-configure-tcl maybe-configure-tk
 all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
@@ -23802,7 +23526,7 @@
 install-itcl: maybe-install-tcl
 all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
 install-sid: maybe-install-tcl maybe-install-tk
-all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
+all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-configure-gdb
 configure-tk: maybe-configure-tcl
 all-tk: maybe-all-tcl
 configure-tix: maybe-configure-tcl maybe-configure-tk
Commit	Line	Data
8ef65460 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 @@
1013231d 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@
d4ef9375 JB	31	--- gdb-6.1/Makefile.in.orig 2004-04-03 18:52:09.000000000 +0200
	32	+++ gdb-6.1/Makefile.in 2004-04-17 22:43:50.603804248 +0200
	33	@@ -571,7 +571,6 @@
8ef65460 AM	34	maybe-configure-perl \
	35	maybe-configure-prms \
	36	maybe-configure-rcs \
	37	- maybe-configure-readline \
	38	maybe-configure-release \
	39	maybe-configure-recode \
	40	maybe-configure-sed \
d4ef9375	41	@@ -661,7 +660,6 @@
8ef65460 AM	42	maybe-all-perl \
	43	maybe-all-prms \
	44	maybe-all-rcs \
	45	- maybe-all-readline \
	46	maybe-all-release \
	47	maybe-all-recode \
	48	maybe-all-sed \
d4ef9375	49	@@ -755,7 +753,6 @@
8ef65460 AM	50	maybe-info-perl \
	51	maybe-info-prms \
	52	maybe-info-rcs \
	53	- maybe-info-readline \
	54	maybe-info-release \
	55	maybe-info-recode \
	56	maybe-info-sed \
d4ef9375	57	@@ -1724,28 +1721,6 @@
8ef65460	58	\|\| exit 1
1013231d	59
1013231d	60
8ef65460 AM	61	-.PHONY: maybe-info-readline info-readline
	62	-maybe-info-readline:
	63	-
	64	-info-readline: \
	65	- configure-readline
	66	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	67	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	68	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	69	- $(SET_LIB_PATH) \
	70	- for flag in $(EXTRA_HOST_FLAGS); do \
	71	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	72	- done; \
	73	- echo "Doing info in readline" ; \
	74	- (cd readline && \
	75	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	76	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	77	- "RANLIB=$${RANLIB}" \
	78	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	79	- info) \
	80	- \|\| exit 1
	81	-
	82	-
	83	.PHONY: maybe-info-release info-release
	84	maybe-info-release:
	85
d4ef9375	86	@@ -2654,7 +2629,6 @@
8ef65460 AM	87	maybe-dvi-perl \
	88	maybe-dvi-prms \
	89	maybe-dvi-rcs \
	90	- maybe-dvi-readline \
	91	maybe-dvi-release \
	92	maybe-dvi-recode \
	93	maybe-dvi-sed \
d4ef9375	94	@@ -3623,28 +3597,6 @@
8ef65460 AM	95	\|\| exit 1
	96
	97
	98	-.PHONY: maybe-dvi-readline dvi-readline
	99	-maybe-dvi-readline:
	100	-
	101	-dvi-readline: \
	102	- configure-readline
	103	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	104	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	105	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	106	- $(SET_LIB_PATH) \
	107	- for flag in $(EXTRA_HOST_FLAGS); do \
	108	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	109	- done; \
	110	- echo "Doing dvi in readline" ; \
	111	- (cd readline && \
	112	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	113	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	114	- "RANLIB=$${RANLIB}" \
	115	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	116	- dvi) \
	117	- \|\| exit 1
	118	-
	119	-
	120	.PHONY: maybe-dvi-release dvi-release
	121	maybe-dvi-release:
	122
d4ef9375	123	@@ -4553,7 +4505,6 @@
8ef65460 AM	124	maybe-TAGS-perl \
	125	maybe-TAGS-prms \
	126	maybe-TAGS-rcs \
	127	- maybe-TAGS-readline \
	128	maybe-TAGS-release \
	129	maybe-TAGS-recode \
	130	maybe-TAGS-sed \
d4ef9375	131	@@ -5522,28 +5473,6 @@
8ef65460 AM	132	\|\| exit 1
	133
	134
	135	-.PHONY: maybe-TAGS-readline TAGS-readline
	136	-maybe-TAGS-readline:
	137	-
	138	-TAGS-readline: \
	139	- configure-readline
	140	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	141	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	142	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	143	- $(SET_LIB_PATH) \
	144	- for flag in $(EXTRA_HOST_FLAGS); do \
	145	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	146	- done; \
	147	- echo "Doing TAGS in readline" ; \
	148	- (cd readline && \
	149	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	150	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	151	- "RANLIB=$${RANLIB}" \
	152	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	153	- TAGS) \
	154	- \|\| exit 1
	155	-
	156	-
	157	.PHONY: maybe-TAGS-release TAGS-release
	158	maybe-TAGS-release:
	159
d4ef9375	160	@@ -6452,7 +6381,6 @@
8ef65460 AM	161	maybe-install-info-perl \
	162	maybe-install-info-prms \
	163	maybe-install-info-rcs \
	164	- maybe-install-info-readline \
	165	maybe-install-info-release \
	166	maybe-install-info-recode \
	167	maybe-install-info-sed \
d4ef9375	168	@@ -7463,29 +7391,6 @@
8ef65460 AM	169	\|\| exit 1
	170
	171
	172	-.PHONY: maybe-install-info-readline install-info-readline
	173	-maybe-install-info-readline:
	174	-
	175	-install-info-readline: \
	176	- configure-readline \
	177	- info-readline
	178	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	179	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	180	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	181	- $(SET_LIB_PATH) \
	182	- for flag in $(EXTRA_HOST_FLAGS); do \
	183	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	184	- done; \
	185	- echo "Doing install-info in readline" ; \
	186	- (cd readline && \
	187	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	188	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	189	- "RANLIB=$${RANLIB}" \
	190	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	191	- install-info) \
	192	- \|\| exit 1
	193	-
	194	-
	195	.PHONY: maybe-install-info-release install-info-release
	196	maybe-install-info-release:
	197
d4ef9375	198	@@ -8433,7 +8338,6 @@
8ef65460 AM	199	maybe-installcheck-perl \
	200	maybe-installcheck-prms \
	201	maybe-installcheck-rcs \
	202	- maybe-installcheck-readline \
	203	maybe-installcheck-release \
	204	maybe-installcheck-recode \
	205	maybe-installcheck-sed \
d4ef9375	206	@@ -9402,28 +9306,6 @@
8ef65460 AM	207	\|\| exit 1
	208
	209
	210	-.PHONY: maybe-installcheck-readline installcheck-readline
	211	-maybe-installcheck-readline:
	212	-
	213	-installcheck-readline: \
	214	- configure-readline
	215	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	216	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	217	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	218	- $(SET_LIB_PATH) \
	219	- for flag in $(EXTRA_HOST_FLAGS); do \
	220	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	221	- done; \
	222	- echo "Doing installcheck in readline" ; \
	223	- (cd readline && \
	224	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	225	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	226	- "RANLIB=$${RANLIB}" \
	227	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	228	- installcheck) \
	229	- \|\| exit 1
	230	-
	231	-
	232	.PHONY: maybe-installcheck-release installcheck-release
	233	maybe-installcheck-release:
	234
d4ef9375	235	@@ -10332,7 +10214,6 @@
8ef65460 AM	236	maybe-mostlyclean-perl \
	237	maybe-mostlyclean-prms \
	238	maybe-mostlyclean-rcs \
	239	- maybe-mostlyclean-readline \
	240	maybe-mostlyclean-release \
	241	maybe-mostlyclean-recode \
	242	maybe-mostlyclean-sed \
d4ef9375	243	@@ -11245,27 +11126,6 @@
8ef65460 AM	244	\|\| exit 1
	245
	246
	247	-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
	248	-maybe-mostlyclean-readline:
	249	-
	250	-mostlyclean-readline:
	251	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	252	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	253	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	254	- $(SET_LIB_PATH) \
	255	- for flag in $(EXTRA_HOST_FLAGS); do \
	256	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	257	- done; \
	258	- echo "Doing mostlyclean in readline" ; \
	259	- (cd readline && \
	260	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	261	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	262	- "RANLIB=$${RANLIB}" \
	263	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	264	- mostlyclean) \
	265	- \|\| exit 1
	266	-
	267	-
	268	.PHONY: maybe-mostlyclean-release mostlyclean-release
	269	maybe-mostlyclean-release:
	270
d4ef9375	271	@@ -12107,7 +11967,6 @@
8ef65460 AM	272	maybe-clean-perl \
	273	maybe-clean-prms \
	274	maybe-clean-rcs \
	275	- maybe-clean-readline \
	276	maybe-clean-release \
	277	maybe-clean-recode \
	278	maybe-clean-sed \
d4ef9375	279	@@ -13034,27 +12893,6 @@
8ef65460 AM	280	\|\| exit 1
	281
	282
	283	-.PHONY: maybe-clean-readline clean-readline
	284	-maybe-clean-readline:
	285	-
	286	-clean-readline:
	287	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	288	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	289	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	290	- $(SET_LIB_PATH) \
	291	- for flag in $(EXTRA_HOST_FLAGS); do \
	292	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	293	- done; \
	294	- echo "Doing clean in readline" ; \
	295	- (cd readline && \
	296	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	297	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	298	- "RANLIB=$${RANLIB}" \
	299	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	300	- clean) \
	301	- \|\| exit 1
	302	-
	303	-
	304	.PHONY: maybe-clean-release clean-release
	305	maybe-clean-release:
	306
d4ef9375	307	@@ -13896,7 +13734,6 @@
8ef65460 AM	308	maybe-distclean-perl \
	309	maybe-distclean-prms \
	310	maybe-distclean-rcs \
	311	- maybe-distclean-readline \
	312	maybe-distclean-release \
	313	maybe-distclean-recode \
	314	maybe-distclean-sed \
d4ef9375	315	@@ -14823,27 +14660,6 @@
8ef65460 AM	316	\|\| exit 1
	317
	318
	319	-.PHONY: maybe-distclean-readline distclean-readline
	320	-maybe-distclean-readline:
	321	-
	322	-distclean-readline:
	323	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	324	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	325	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	326	- $(SET_LIB_PATH) \
	327	- for flag in $(EXTRA_HOST_FLAGS); do \
	328	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	329	- done; \
	330	- echo "Doing distclean in readline" ; \
	331	- (cd readline && \
	332	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	333	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	334	- "RANLIB=$${RANLIB}" \
	335	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	336	- distclean) \
	337	- \|\| exit 1
	338	-
	339	-
	340	.PHONY: maybe-distclean-release distclean-release
	341	maybe-distclean-release:
	342
d4ef9375	343	@@ -15685,7 +15501,6 @@
8ef65460 AM	344	maybe-maintainer-clean-perl \
	345	maybe-maintainer-clean-prms \
	346	maybe-maintainer-clean-rcs \
	347	- maybe-maintainer-clean-readline \
	348	maybe-maintainer-clean-release \
	349	maybe-maintainer-clean-recode \
	350	maybe-maintainer-clean-sed \
d4ef9375	351	@@ -16612,27 +16427,6 @@
8ef65460 AM	352	\|\| exit 1
	353
	354
	355	-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
	356	-maybe-maintainer-clean-readline:
	357	-
	358	-maintainer-clean-readline:
	359	- @[ -f ./readline/Makefile ] \|\| exit 0; \
d4ef9375 JB	360	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	361	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	362	- $(SET_LIB_PATH) \
	363	- for flag in $(EXTRA_HOST_FLAGS); do \
	364	- eval `echo "$$flag" \| sed -e "s\|^\([^=]\)=\(.\)\|\1='\2'; export \1\|"`; \
	365	- done; \
	366	- echo "Doing maintainer-clean in readline" ; \
	367	- (cd readline && \
	368	- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
	369	- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
	370	- "RANLIB=$${RANLIB}" \
	371	- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
	372	- maintainer-clean) \
	373	- \|\| exit 1
	374	-
	375	-
	376	.PHONY: maybe-maintainer-clean-release maintainer-clean-release
	377	maybe-maintainer-clean-release:
	378
d4ef9375	379	@@ -17531,7 +17325,6 @@
8ef65460 AM	380	maybe-check-perl \
	381	maybe-check-prms \
	382	maybe-check-rcs \
	383	- maybe-check-readline \
	384	maybe-check-release \
	385	maybe-check-recode \
	386	maybe-check-sed \
d4ef9375	387	@@ -17641,7 +17434,6 @@
8ef65460 AM	388	maybe-install-perl \
	389	maybe-install-prms \
	390	maybe-install-rcs \
	391	- maybe-install-readline \
	392	maybe-install-release \
	393	maybe-install-recode \
	394	maybe-install-sed \
d4ef9375	395	@@ -17708,7 +17500,6 @@
8ef65460 AM	396	maybe-install-perl \
	397	maybe-install-prms \
	398	maybe-install-rcs \
	399	- maybe-install-readline \
	400	maybe-install-release \
	401	maybe-install-recode \
	402	maybe-install-sed \
d4ef9375	403	@@ -20631,73 +20422,6 @@
8ef65460 AM	404	(cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
8ef65460 AM	405
1013231d	406
8ef65460 AM	407	-.PHONY: configure-readline maybe-configure-readline
	408	-maybe-configure-readline:
	409	-configure-readline:
	410	- @test ! -f readline/Makefile \|\| exit 0; \
	411	- [ -d readline ] \|\| mkdir readline; \
d4ef9375 JB	412	- r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	413	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	414	- CC="$(CC)"; export CC; \
8ef65460 AM	415	- CFLAGS="$(CFLAGS)"; export CFLAGS; \
d4ef9375	416	- CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
8ef65460 AM	417	- CXX="$(CXX)"; export CXX; \
	418	- CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
	419	- AR="$(AR)"; export AR; \
	420	- AS="$(AS)"; export AS; \
	421	- CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
	422	- DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
	423	- LD="$(LD)"; export LD; \
	424	- NM="$(NM)"; export NM; \
	425	- RANLIB="$(RANLIB)"; export RANLIB; \
	426	- WINDRES="$(WINDRES)"; export WINDRES; \
	427	- OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
	428	- OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
	429	- echo Configuring in readline; \
	430	- cd readline \|\| exit 1; \
	431	- case $(srcdir) in \
	432	- \.) \
	433	- srcdiroption="--srcdir=."; \
	434	- libsrcdir=".";; \
	435	- /* \| [A-Za-z]:[\\/]*) \
	436	- srcdiroption="--srcdir=$(srcdir)/readline"; \
	437	- libsrcdir="$$s/readline";; \
	438	- *) \
	439	- srcdiroption="--srcdir=../$(srcdir)/readline"; \
	440	- libsrcdir="$$s/readline";; \
	441	- esac; \
	442	- $(SHELL) $${libsrcdir}/configure \
	443	- $(HOST_CONFIGARGS) $${srcdiroption} \
	444	- \|\| exit 1
	445	-
	446	-.PHONY: all-readline maybe-all-readline
	447	-maybe-all-readline:
	448	-all-readline: configure-readline
d4ef9375 JB	449	- @r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	450	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	451	- $(SET_LIB_PATH) \
	452	- (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
	453	-
	454	-.PHONY: check-readline maybe-check-readline
	455	-maybe-check-readline:
	456	-
	457	-check-readline:
d4ef9375 JB	458	- @r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	459	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	460	- $(SET_LIB_PATH) \
	461	- (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
	462	-
	463	-
	464	-.PHONY: install-readline maybe-install-readline
	465	-maybe-install-readline:
	466	-
	467	-install-readline: installdirs
d4ef9375 JB	468	- @r=`${PWD_COMMAND}`; export r; \
d4ef9375 JB	469	- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
8ef65460 AM	470	- $(SET_LIB_PATH) \
	471	- (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
	472	-
	473	-
	474	.PHONY: configure-release maybe-configure-release
	475	maybe-configure-release:
	476	configure-release:
d4ef9375	477	@@ -23771,7 +23495,7 @@
8ef65460 AM	478	# GDB needs to know that the simulator is being built.
	479	configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
	480	GDB_TK = @GDB_TK@
	481	-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
	482	+all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
	483	install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
	484	configure-libgui: maybe-configure-tcl maybe-configure-tk
	485	all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
d4ef9375	486	@@ -23802,7 +23526,7 @@
8ef65460 AM	487	install-itcl: maybe-install-tcl
	488	all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
	489	install-sid: maybe-install-tcl maybe-install-tk
	490	-all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
	491	+all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-configure-gdb
	492	configure-tk: maybe-configure-tcl
	493	all-tk: maybe-all-tcl
	494	configure-tix: maybe-configure-tcl maybe-configure-tk