]>
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@ | |
d2fe5bd3 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) | |
50d346d1 JB |
40 | --- gdb-6.2/Makefile.in.orig 2004-07-30 00:49:41.000000000 +0200 |
41 | +++ gdb-6.2/Makefile.in 2004-07-31 21:35:43.554574184 +0200 | |
42 | @@ -686,7 +686,6 @@ | |
8ef65460 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 \ | |
50d346d1 | 50 | @@ -788,7 +787,6 @@ |
8ef65460 AM |
51 | maybe-all-perl \ |
52 | maybe-all-prms \ | |
53 | maybe-all-rcs \ | |
54 | - maybe-all-readline \ | |
55 | maybe-all-release \ | |
56 | maybe-all-recode \ | |
57 | maybe-all-sed \ | |
50d346d1 | 58 | @@ -885,7 +883,6 @@ |
8ef65460 AM |
59 | maybe-info-perl \ |
60 | maybe-info-prms \ | |
61 | maybe-info-rcs \ | |
62 | - maybe-info-readline \ | |
63 | maybe-info-release \ | |
64 | maybe-info-recode \ | |
65 | maybe-info-sed \ | |
50d346d1 | 66 | @@ -978,7 +975,6 @@ |
8ef65460 AM |
67 | maybe-dvi-perl \ |
68 | maybe-dvi-prms \ | |
69 | maybe-dvi-rcs \ | |
70 | - maybe-dvi-readline \ | |
71 | maybe-dvi-release \ | |
72 | maybe-dvi-recode \ | |
73 | maybe-dvi-sed \ | |
50d346d1 | 74 | @@ -1071,7 +1067,6 @@ |
8ef65460 AM |
75 | maybe-TAGS-perl \ |
76 | maybe-TAGS-prms \ | |
77 | maybe-TAGS-rcs \ | |
78 | - maybe-TAGS-readline \ | |
79 | maybe-TAGS-release \ | |
80 | maybe-TAGS-recode \ | |
81 | maybe-TAGS-sed \ | |
50d346d1 | 82 | @@ -1164,7 +1159,6 @@ |
8ef65460 AM |
83 | maybe-install-info-perl \ |
84 | maybe-install-info-prms \ | |
85 | maybe-install-info-rcs \ | |
86 | - maybe-install-info-readline \ | |
87 | maybe-install-info-release \ | |
88 | maybe-install-info-recode \ | |
89 | maybe-install-info-sed \ | |
50d346d1 | 90 | @@ -1257,7 +1251,6 @@ |
8ef65460 AM |
91 | maybe-installcheck-perl \ |
92 | maybe-installcheck-prms \ | |
93 | maybe-installcheck-rcs \ | |
94 | - maybe-installcheck-readline \ | |
95 | maybe-installcheck-release \ | |
96 | maybe-installcheck-recode \ | |
97 | maybe-installcheck-sed \ | |
50d346d1 | 98 | @@ -1350,7 +1343,6 @@ |
8ef65460 AM |
99 | maybe-mostlyclean-perl \ |
100 | maybe-mostlyclean-prms \ | |
101 | maybe-mostlyclean-rcs \ | |
102 | - maybe-mostlyclean-readline \ | |
103 | maybe-mostlyclean-release \ | |
104 | maybe-mostlyclean-recode \ | |
105 | maybe-mostlyclean-sed \ | |
50d346d1 | 106 | @@ -1443,7 +1435,6 @@ |
8ef65460 AM |
107 | maybe-clean-perl \ |
108 | maybe-clean-prms \ | |
109 | maybe-clean-rcs \ | |
110 | - maybe-clean-readline \ | |
111 | maybe-clean-release \ | |
112 | maybe-clean-recode \ | |
113 | maybe-clean-sed \ | |
50d346d1 | 114 | @@ -1536,7 +1527,6 @@ |
8ef65460 AM |
115 | maybe-distclean-perl \ |
116 | maybe-distclean-prms \ | |
117 | maybe-distclean-rcs \ | |
118 | - maybe-distclean-readline \ | |
119 | maybe-distclean-release \ | |
120 | maybe-distclean-recode \ | |
121 | maybe-distclean-sed \ | |
50d346d1 | 122 | @@ -1629,7 +1619,6 @@ |
8ef65460 AM |
123 | maybe-maintainer-clean-perl \ |
124 | maybe-maintainer-clean-prms \ | |
125 | maybe-maintainer-clean-rcs \ | |
126 | - maybe-maintainer-clean-readline \ | |
127 | maybe-maintainer-clean-release \ | |
128 | maybe-maintainer-clean-recode \ | |
129 | maybe-maintainer-clean-sed \ | |
50d346d1 | 130 | @@ -1779,7 +1768,6 @@ |
8ef65460 AM |
131 | maybe-check-perl \ |
132 | maybe-check-prms \ | |
133 | maybe-check-rcs \ | |
134 | - maybe-check-readline \ | |
135 | maybe-check-release \ | |
136 | maybe-check-recode \ | |
137 | maybe-check-sed \ | |
50d346d1 | 138 | @@ -1892,7 +1880,6 @@ |
8ef65460 AM |
139 | maybe-install-perl \ |
140 | maybe-install-prms \ | |
141 | maybe-install-rcs \ | |
142 | - maybe-install-readline \ | |
143 | maybe-install-release \ | |
144 | maybe-install-recode \ | |
145 | maybe-install-sed \ | |
50d346d1 | 146 | @@ -1961,7 +1948,6 @@ |
8ef65460 AM |
147 | maybe-install-perl \ |
148 | maybe-install-prms \ | |
149 | maybe-install-rcs \ | |
150 | - maybe-install-readline \ | |
151 | maybe-install-release \ | |
152 | maybe-install-recode \ | |
153 | maybe-install-sed \ | |
50d346d1 | 154 | @@ -29207,7 +29193,7 @@ |
8ef65460 AM |
155 | # GDB needs to know that the simulator is being built. |
156 | configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim | |
157 | GDB_TK = @GDB_TK@ | |
158 | -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) | |
159 | +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) | |
160 | install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui | |
161 | configure-libgui: maybe-configure-tcl maybe-configure-tk | |
162 | all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl | |
50d346d1 | 163 | @@ -29238,7 +29224,7 @@ |
8ef65460 AM |
164 | install-itcl: maybe-install-tcl |
165 | all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk | |
166 | install-sid: maybe-install-tcl maybe-install-tk | |
167 | -all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb | |
168 | +all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-configure-gdb | |
169 | configure-tk: maybe-configure-tcl | |
170 | all-tk: maybe-all-tcl | |
171 | configure-tix: maybe-configure-tcl maybe-configure-tk |