]>
Commit | Line | Data |
---|---|---|
1518aa58 AM |
1 | --- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200 |
2 | +++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200 | |
e28f2cc1 AM |
3 | @@ -175,11 +175,11 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM |
4 | LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC) | |
1013231d | 5 | |
e28f2cc1 AM |
6 | # Where is the READLINE library? Typically in ../readline/readline. |
7 | -READLINE_DIR = ../readline/readline | |
1013231d | 8 | -READLINE_SRC = $(srcdir)/$(READLINE_DIR) |
1518aa58 AM |
9 | -READLINE = @READLINE@ |
10 | -READLINE_DEPS = @READLINE_DEPS@ | |
11 | -READLINE_CFLAGS = @READLINE_CFLAGS@ | |
1013231d AM |
12 | +READLINE_DIR = /usr/include/readline |
13 | +READLINE = -lreadline | |
14 | +READLINE_SRC = /usr/include/readline | |
1518aa58 | 15 | +READLINE_DEPS = |
1013231d AM |
16 | +READLINE_CFLAGS = -I/usr/include/readline |
17 | ||
1518aa58 AM |
18 | # Where is expat? This will be empty if expat was not available. |
19 | LIBEXPAT = @LIBEXPAT@ | |
e28f2cc1 | 20 | @@ -613,7 +613,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $( |
174fe25c JP |
21 | $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \ |
22 | $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ | |
23 | $(DEBUGINFOD_LIBS) | |
24 | -CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ | |
25 | +CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(CTF_DEPS) \ | |
26 | $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \ | |
27 | $(LIBSUPPORT) | |
d2fe5bd3 | 28 | |
f412e1b4 PS |
29 | --- gdb-7.4.50.20120120/Makefile.in.orig 2012-01-20 02:48:18.000000000 +0100 |
30 | +++ gdb-7.4.50.20120120/Makefile.in 2012-03-17 10:35:14.194730128 +0100 | |
31 | @@ -922,7 +922,6 @@ | |
9f8b257d | 32 | maybe-configure-libiberty-linker-plugin \ |
f412e1b4 PS |
33 | maybe-configure-libiconv \ |
34 | maybe-configure-m4 \ | |
8ef65460 | 35 | - maybe-configure-readline \ |
f412e1b4 PS |
36 | maybe-configure-sid \ |
37 | maybe-configure-sim \ | |
38 | maybe-configure-texinfo \ | |
e28f2cc1 | 39 | @@ -1149,7 +1148,6 @@ |
9f8b257d | 40 | info-host: maybe-info-libiberty-linker-plugin |
f412e1b4 PS |
41 | info-host: maybe-info-libiconv |
42 | info-host: maybe-info-m4 | |
9e3bef55 | 43 | -info-host: maybe-info-readline |
f412e1b4 PS |
44 | info-host: maybe-info-sid |
45 | info-host: maybe-info-sim | |
46 | info-host: maybe-info-texinfo | |
e28f2cc1 | 47 | @@ -1226,7 +1224,6 @@ |
9f8b257d | 48 | dvi-host: maybe-dvi-libiberty-linker-plugin |
f412e1b4 PS |
49 | dvi-host: maybe-dvi-libiconv |
50 | dvi-host: maybe-dvi-m4 | |
9e3bef55 | 51 | -dvi-host: maybe-dvi-readline |
f412e1b4 PS |
52 | dvi-host: maybe-dvi-sid |
53 | dvi-host: maybe-dvi-sim | |
54 | dvi-host: maybe-dvi-texinfo | |
e28f2cc1 | 55 | @@ -1303,7 +1300,6 @@ |
9f8b257d | 56 | pdf-host: maybe-pdf-libiberty-linker-plugin |
f412e1b4 PS |
57 | pdf-host: maybe-pdf-libiconv |
58 | pdf-host: maybe-pdf-m4 | |
59 | -pdf-host: maybe-pdf-readline | |
60 | pdf-host: maybe-pdf-sid | |
61 | pdf-host: maybe-pdf-sim | |
62 | pdf-host: maybe-pdf-texinfo | |
e28f2cc1 | 63 | @@ -1380,7 +1376,6 @@ |
9f8b257d | 64 | html-host: maybe-html-libiberty-linker-plugin |
f412e1b4 PS |
65 | html-host: maybe-html-libiconv |
66 | html-host: maybe-html-m4 | |
9e3bef55 | 67 | -html-host: maybe-html-readline |
f412e1b4 PS |
68 | html-host: maybe-html-sid |
69 | html-host: maybe-html-sim | |
70 | html-host: maybe-html-texinfo | |
e28f2cc1 | 71 | @@ -1457,7 +1452,6 @@ |
9f8b257d | 72 | TAGS-host: maybe-TAGS-libiberty-linker-plugin |
f412e1b4 PS |
73 | TAGS-host: maybe-TAGS-libiconv |
74 | TAGS-host: maybe-TAGS-m4 | |
75 | -TAGS-host: maybe-TAGS-readline | |
76 | TAGS-host: maybe-TAGS-sid | |
77 | TAGS-host: maybe-TAGS-sim | |
78 | TAGS-host: maybe-TAGS-texinfo | |
e28f2cc1 | 79 | @@ -1534,7 +1528,6 @@ |
9f8b257d | 80 | install-info-host: maybe-install-info-libiberty-linker-plugin |
f412e1b4 PS |
81 | install-info-host: maybe-install-info-libiconv |
82 | install-info-host: maybe-install-info-m4 | |
9e3bef55 | 83 | -install-info-host: maybe-install-info-readline |
f412e1b4 PS |
84 | install-info-host: maybe-install-info-sid |
85 | install-info-host: maybe-install-info-sim | |
86 | install-info-host: maybe-install-info-texinfo | |
e28f2cc1 | 87 | @@ -1611,7 +1604,6 @@ |
9f8b257d | 88 | install-pdf-host: maybe-install-pdf-libiberty-linker-plugin |
f412e1b4 PS |
89 | install-pdf-host: maybe-install-pdf-libiconv |
90 | install-pdf-host: maybe-install-pdf-m4 | |
91 | -install-pdf-host: maybe-install-pdf-readline | |
92 | install-pdf-host: maybe-install-pdf-sid | |
93 | install-pdf-host: maybe-install-pdf-sim | |
94 | install-pdf-host: maybe-install-pdf-texinfo | |
e28f2cc1 | 95 | @@ -1688,7 +1680,6 @@ |
9f8b257d | 96 | install-html-host: maybe-install-html-libiberty-linker-plugin |
f412e1b4 PS |
97 | install-html-host: maybe-install-html-libiconv |
98 | install-html-host: maybe-install-html-m4 | |
9e3bef55 | 99 | -install-html-host: maybe-install-html-readline |
f412e1b4 PS |
100 | install-html-host: maybe-install-html-sid |
101 | install-html-host: maybe-install-html-sim | |
102 | install-html-host: maybe-install-html-texinfo | |
e28f2cc1 | 103 | @@ -1765,7 +1756,6 @@ |
9f8b257d | 104 | installcheck-host: maybe-installcheck-libiberty-linker-plugin |
f412e1b4 PS |
105 | installcheck-host: maybe-installcheck-libiconv |
106 | installcheck-host: maybe-installcheck-m4 | |
9e3bef55 | 107 | -installcheck-host: maybe-installcheck-readline |
f412e1b4 PS |
108 | installcheck-host: maybe-installcheck-sid |
109 | installcheck-host: maybe-installcheck-sim | |
110 | installcheck-host: maybe-installcheck-texinfo | |
e28f2cc1 | 111 | @@ -1842,7 +1832,6 @@ |
9f8b257d | 112 | mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin |
f412e1b4 PS |
113 | mostlyclean-host: maybe-mostlyclean-libiconv |
114 | mostlyclean-host: maybe-mostlyclean-m4 | |
9e3bef55 | 115 | -mostlyclean-host: maybe-mostlyclean-readline |
f412e1b4 PS |
116 | mostlyclean-host: maybe-mostlyclean-sid |
117 | mostlyclean-host: maybe-mostlyclean-sim | |
118 | mostlyclean-host: maybe-mostlyclean-texinfo | |
e28f2cc1 | 119 | @@ -1919,7 +1908,6 @@ |
9f8b257d | 120 | clean-host: maybe-clean-libiberty-linker-plugin |
f412e1b4 PS |
121 | clean-host: maybe-clean-libiconv |
122 | clean-host: maybe-clean-m4 | |
9e3bef55 | 123 | -clean-host: maybe-clean-readline |
f412e1b4 PS |
124 | clean-host: maybe-clean-sid |
125 | clean-host: maybe-clean-sim | |
126 | clean-host: maybe-clean-texinfo | |
e28f2cc1 | 127 | @@ -1996,7 +1984,6 @@ |
9f8b257d | 128 | distclean-host: maybe-distclean-libiberty-linker-plugin |
f412e1b4 PS |
129 | distclean-host: maybe-distclean-libiconv |
130 | distclean-host: maybe-distclean-m4 | |
9e3bef55 | 131 | -distclean-host: maybe-distclean-readline |
f412e1b4 PS |
132 | distclean-host: maybe-distclean-sid |
133 | distclean-host: maybe-distclean-sim | |
134 | distclean-host: maybe-distclean-texinfo | |
e28f2cc1 | 135 | @@ -2073,7 +2060,6 @@ |
9f8b257d | 136 | maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin |
f412e1b4 PS |
137 | maintainer-clean-host: maybe-maintainer-clean-libiconv |
138 | maintainer-clean-host: maybe-maintainer-clean-m4 | |
9e3bef55 | 139 | -maintainer-clean-host: maybe-maintainer-clean-readline |
f412e1b4 PS |
140 | maintainer-clean-host: maybe-maintainer-clean-sid |
141 | maintainer-clean-host: maybe-maintainer-clean-sim | |
142 | maintainer-clean-host: maybe-maintainer-clean-texinfo | |
e28f2cc1 | 143 | @@ -2205,7 +2191,6 @@ |
9f8b257d | 144 | maybe-check-libiberty-linker-plugin \ |
f412e1b4 PS |
145 | maybe-check-libiconv \ |
146 | maybe-check-m4 \ | |
8ef65460 | 147 | - maybe-check-readline \ |
f412e1b4 PS |
148 | maybe-check-sid \ |
149 | maybe-check-sim \ | |
150 | maybe-check-texinfo \ | |
e28f2cc1 | 151 | @@ -2308,7 +2293,6 @@ |
9f8b257d | 152 | maybe-install-libiberty-linker-plugin \ |
f412e1b4 PS |
153 | maybe-install-libiconv \ |
154 | maybe-install-m4 \ | |
8ef65460 | 155 | - maybe-install-readline \ |
f412e1b4 PS |
156 | maybe-install-sid \ |
157 | maybe-install-sim \ | |
158 | maybe-install-texinfo \ | |
e28f2cc1 | 159 | @@ -2354,7 +2338,6 @@ |
9f8b257d | 160 | maybe-install-libiberty-linker-plugin \ |
f412e1b4 PS |
161 | maybe-install-libiconv \ |
162 | maybe-install-m4 \ | |
8ef65460 | 163 | - maybe-install-readline \ |
f412e1b4 PS |
164 | maybe-install-sid \ |
165 | maybe-install-sim \ | |
166 | maybe-install-texinfo \ | |
e28f2cc1 | 167 | @@ -2450,7 +2433,6 @@ |
9f8b257d | 168 | maybe-install-strip-libiberty-linker-plugin \ |
f412e1b4 PS |
169 | maybe-install-strip-libiconv \ |
170 | maybe-install-strip-m4 \ | |
171 | - maybe-install-strip-readline \ | |
172 | maybe-install-strip-sid \ | |
173 | maybe-install-strip-sim \ | |
174 | maybe-install-strip-texinfo \ | |
e28f2cc1 | 175 | @@ -51050,7 +51032,6 @@ all-stagefeedback-intl: maybe-all-stagef |
174fe25c | 176 | configure-gdb: maybe-all-gdbsupport |
e28f2cc1 | 177 | all-gdb: maybe-all-gnulib |
174fe25c | 178 | all-gdb: maybe-all-gdbsupport |
9b6000ea JB |
179 | -all-gdb: maybe-all-readline |
180 | all-gdb: maybe-all-build-bison | |
9b6000ea | 181 | all-gdb: maybe-all-sim |
ed003b1c | 182 | all-gdb: maybe-all-libtermcap |
e28f2cc1 | 183 | @@ -51387,7 +51368,6 @@ install-sid: maybe-install-tcl |
ed003b1c AM |
184 | install-strip-sid: maybe-install-strip-tcl |
185 | install-sid: maybe-install-tk | |
186 | install-strip-sid: maybe-install-strip-tk | |
9b6000ea JB |
187 | -all-sim: maybe-all-readline |
188 | all-sim: maybe-configure-gdb | |
9b6000ea | 189 | all-fastjar: maybe-all-build-texinfo |
e28f2cc1 | 190 | all-libctf: all-libiberty |