]>
Commit | Line | Data |
---|---|---|
657a7cb1 | 1 | diff -Nur STLport-4.5.1/src/common_macros.mak STLport-4.5.1.new/src/common_macros.mak |
2 | --- STLport-4.5.1/src/common_macros.mak Thu Nov 15 23:08:56 2001 | |
3 | +++ STLport-4.5.1.new/src/common_macros.mak Sat Dec 15 22:45:50 2001 | |
4 | @@ -29,14 +29,8 @@ | |
5 | OBJDIR=$(OUTDIR)$(PATH_SEP)obj$(PATH_SEP)$(COMP) | |
2117cc10 | 6 | |
657a7cb1 | 7 | RELEASE_OBJDIR_static=$(OBJDIR)$(PATH_SEP)Release |
8 | -DEBUG_OBJDIR_static=$(OBJDIR)$(PATH_SEP)Debug | |
9 | -STLDEBUG_OBJDIR_static=$(OBJDIR)$(PATH_SEP)DebugSTL | |
10 | RELEASE_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Releasex | |
11 | -DEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)Debugx | |
12 | -STLDEBUG_OBJDIR_staticx=$(OBJDIR)$(PATH_SEP)DebugSTLx | |
13 | RELEASE_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)ReleaseD | |
14 | -DEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugD | |
15 | -STLDEBUG_OBJDIR_dynamic=$(OBJDIR)$(PATH_SEP)DebugSTLD | |
2117cc10 | 16 | |
17 | # | |
657a7cb1 | 18 | # By default on UNIX, STLport headers go into /usr/local/include/stlport, |
19 | @@ -59,33 +53,20 @@ | |
2117cc10 | 20 | # |
21 | ||
22 | RELEASE_NAME=$(LIB_BASENAME) | |
23 | -DEBUG_NAME=$(LIB_BASENAME)_debug | |
24 | -STLDEBUG_NAME=$(LIB_BASENAME)_stldebug | |
25 | ||
657a7cb1 | 26 | RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX) |
27 | -DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX) | |
28 | -STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)$(DYNAMIC_SUFFIX) | |
29 | ||
30 | RELEASE_DYNLIB_SONAME=$(RELEASE_NAME).$(DYNEXT)$(VERSION_SUFFIX) | |
31 | -DEBUG_DYNLIB_SONAME=$(DEBUG_NAME).$(DYNEXT)$(VERSION_SUFFIX) | |
32 | -STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME).$(DYNEXT)$(VERSION_SUFFIX) | |
2117cc10 | 33 | |
34 | RELEASE_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX).$(STEXT) | |
35 | -DEBUG_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX).$(STEXT) | |
36 | -STLDEBUG_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX).$(STEXT) | |
37 | ||
657a7cb1 | 38 | RELEASEX_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX)x.$(STEXT) |
39 | -DEBUGX_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX)x.$(STEXT) | |
40 | -STLDEBUGX_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX)x.$(STEXT) | |
41 | ||
42 | ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) | |
43 | -DEBUG_STATIC_LIBS=$(ALL_STATIC_LIBS) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) | |
44 | ||
45 | ALL_STATICX_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) | |
46 | -DEBUG_STATICX_LIBS=$(ALL_STATICX_LIBS) $(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB) | |
47 | ||
48 | ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) | |
49 | -DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) | |
50 | ||
51 | ||
52 | RELEASE_OBJECTS_static= \ | |
53 | @@ -124,76 +105,6 @@ | |
54 | $(RELEASE_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT) | |
2117cc10 | 55 | |
2117cc10 | 56 | |
2117cc10 | 57 | -DEBUG_OBJECTS_static= \ |
58 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
657a7cb1 | 59 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \ |
60 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \ | |
61 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \ | |
2117cc10 | 62 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \ |
63 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
64 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
657a7cb1 | 65 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \ |
66 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \ | |
2117cc10 | 67 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \ |
2117cc10 | 68 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \ |
2117cc10 | 69 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \ |
2117cc10 | 70 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \ |
2117cc10 | 71 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \ |
2117cc10 | 72 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \ |
2117cc10 | 73 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \ |
657a7cb1 | 74 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \ |
2117cc10 | 75 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \ |
2117cc10 | 76 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \ |
2117cc10 | 77 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \ |
657a7cb1 | 78 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \ |
79 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
80 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \ | |
81 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
82 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
83 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
84 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
85 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \ | |
86 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
87 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
88 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
2117cc10 | 89 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \ |
657a7cb1 | 90 | -$(DEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT) |
2117cc10 | 91 | - |
92 | -STLDEBUG_OBJECTS_static= \ | |
93 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
657a7cb1 | 94 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)fstream.$(OBJEXT) \ |
95 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)strstream.$(OBJEXT) \ | |
96 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)sstream.$(OBJEXT) \ | |
2117cc10 | 97 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ios.$(OBJEXT) \ |
98 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
99 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
657a7cb1 | 100 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)istream.$(OBJEXT) \ |
101 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ostream.$(OBJEXT) \ | |
2117cc10 | 102 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)iostream.$(OBJEXT) \ |
2117cc10 | 103 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)codecvt.$(OBJEXT) \ |
2117cc10 | 104 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)collate.$(OBJEXT) \ |
2117cc10 | 105 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)ctype.$(OBJEXT) \ |
2117cc10 | 106 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)monetary.$(OBJEXT) \ |
2117cc10 | 107 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get.$(OBJEXT) \ |
2117cc10 | 108 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put.$(OBJEXT) \ |
657a7cb1 | 109 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_get_float.$(OBJEXT) \ |
2117cc10 | 110 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)num_put_float.$(OBJEXT) \ |
2117cc10 | 111 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)numpunct.$(OBJEXT) \ |
2117cc10 | 112 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)time_facets.$(OBJEXT) \ |
657a7cb1 | 113 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)messages.$(OBJEXT) \ |
114 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
115 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale.$(OBJEXT) \ | |
116 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
117 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
118 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
119 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
120 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex.$(OBJEXT) \ | |
121 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
122 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
123 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
2117cc10 | 124 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)complex_io_w.$(OBJEXT) \ |
657a7cb1 | 125 | -$(STLDEBUG_OBJDIR_static)$(PATH_SEP)string_w.$(OBJEXT) |
126 | - | |
127 | ########################################################### | |
128 | ||
129 | RELEASE_OBJECTS_staticx= \ | |
130 | @@ -232,77 +143,6 @@ | |
131 | $(RELEASE_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT) | |
132 | ||
133 | ||
134 | -DEBUG_OBJECTS_staticx= \ | |
135 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
136 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)fstream.$(OBJEXT) \ | |
137 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)strstream.$(OBJEXT) \ | |
138 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)sstream.$(OBJEXT) \ | |
139 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ios.$(OBJEXT) \ | |
140 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
141 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
142 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)istream.$(OBJEXT) \ | |
143 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ostream.$(OBJEXT) \ | |
144 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)iostream.$(OBJEXT) \ | |
145 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)codecvt.$(OBJEXT) \ | |
146 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)collate.$(OBJEXT) \ | |
147 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)ctype.$(OBJEXT) \ | |
148 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)monetary.$(OBJEXT) \ | |
149 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_get.$(OBJEXT) \ | |
150 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_put.$(OBJEXT) \ | |
151 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_get_float.$(OBJEXT) \ | |
152 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)num_put_float.$(OBJEXT) \ | |
153 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)numpunct.$(OBJEXT) \ | |
154 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)time_facets.$(OBJEXT) \ | |
155 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)messages.$(OBJEXT) \ | |
156 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
157 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale.$(OBJEXT) \ | |
158 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
159 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
160 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
161 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
162 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex.$(OBJEXT) \ | |
163 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
164 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
165 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
166 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io_w.$(OBJEXT) \ | |
167 | -$(DEBUG_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT) | |
168 | - | |
169 | -STLDEBUG_OBJECTS_staticx= \ | |
170 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
171 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)fstream.$(OBJEXT) \ | |
172 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)strstream.$(OBJEXT) \ | |
173 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)sstream.$(OBJEXT) \ | |
174 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ios.$(OBJEXT) \ | |
175 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
176 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
177 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)istream.$(OBJEXT) \ | |
178 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ostream.$(OBJEXT) \ | |
179 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)iostream.$(OBJEXT) \ | |
180 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)codecvt.$(OBJEXT) \ | |
181 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)collate.$(OBJEXT) \ | |
182 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)ctype.$(OBJEXT) \ | |
183 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)monetary.$(OBJEXT) \ | |
184 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_get.$(OBJEXT) \ | |
185 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_put.$(OBJEXT) \ | |
186 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_get_float.$(OBJEXT) \ | |
187 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)num_put_float.$(OBJEXT) \ | |
188 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)numpunct.$(OBJEXT) \ | |
189 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)time_facets.$(OBJEXT) \ | |
190 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)messages.$(OBJEXT) \ | |
191 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
192 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale.$(OBJEXT) \ | |
193 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
194 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
195 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
196 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
197 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex.$(OBJEXT) \ | |
198 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
199 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
200 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
201 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)complex_io_w.$(OBJEXT) \ | |
202 | -$(STLDEBUG_OBJDIR_staticx)$(PATH_SEP)string_w.$(OBJEXT) | |
203 | - | |
2117cc10 | 204 | - |
205 | ########################################################### | |
206 | ||
207 | RELEASE_OBJECTS_dynamic= \ | |
657a7cb1 | 208 | @@ -341,76 +181,4 @@ |
209 | $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \ | |
2117cc10 | 210 | $(RESFILE) |
657a7cb1 | 211 | |
2117cc10 | 212 | -DEBUG_OBJECTS_dynamic= \ |
213 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
657a7cb1 | 214 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)fstream.$(OBJEXT) \ |
215 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)strstream.$(OBJEXT) \ | |
216 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)sstream.$(OBJEXT) \ | |
2117cc10 | 217 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ios.$(OBJEXT) \ |
218 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
219 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
657a7cb1 | 220 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)istream.$(OBJEXT) \ |
221 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ostream.$(OBJEXT) \ | |
2117cc10 | 222 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)iostream.$(OBJEXT) \ |
2117cc10 | 223 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)codecvt.$(OBJEXT) \ |
2117cc10 | 224 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)collate.$(OBJEXT) \ |
2117cc10 | 225 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)ctype.$(OBJEXT) \ |
2117cc10 | 226 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)monetary.$(OBJEXT) \ |
2117cc10 | 227 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get.$(OBJEXT) \ |
2117cc10 | 228 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put.$(OBJEXT) \ |
657a7cb1 | 229 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get_float.$(OBJEXT) \ |
2117cc10 | 230 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put_float.$(OBJEXT) \ |
2117cc10 | 231 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)numpunct.$(OBJEXT) \ |
2117cc10 | 232 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)time_facets.$(OBJEXT) \ |
657a7cb1 | 233 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)messages.$(OBJEXT) \ |
234 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
235 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale.$(OBJEXT) \ | |
236 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
237 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
238 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
239 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
240 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex.$(OBJEXT) \ | |
241 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
242 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
243 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
2117cc10 | 244 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io_w.$(OBJEXT) \ |
2117cc10 | 245 | -$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \ |
2117cc10 | 246 | -$(RESFILE_debug) |
247 | - | |
2117cc10 | 248 | -STLDEBUG_OBJECTS_dynamic= \ |
249 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)dll_main.$(OBJEXT) \ | |
657a7cb1 | 250 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)fstream.$(OBJEXT) \ |
251 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)strstream.$(OBJEXT) \ | |
252 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)sstream.$(OBJEXT) \ | |
2117cc10 | 253 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ios.$(OBJEXT) \ |
254 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)streambuf.$(OBJEXT) \ | |
255 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stdio_streambuf.$(OBJEXT) \ | |
657a7cb1 | 256 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)istream.$(OBJEXT) \ |
257 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ostream.$(OBJEXT) \ | |
2117cc10 | 258 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)iostream.$(OBJEXT) \ |
2117cc10 | 259 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)codecvt.$(OBJEXT) \ |
2117cc10 | 260 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)collate.$(OBJEXT) \ |
2117cc10 | 261 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)ctype.$(OBJEXT) \ |
2117cc10 | 262 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)monetary.$(OBJEXT) \ |
2117cc10 | 263 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get.$(OBJEXT) \ |
2117cc10 | 264 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put.$(OBJEXT) \ |
657a7cb1 | 265 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_get_float.$(OBJEXT) \ |
2117cc10 | 266 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)num_put_float.$(OBJEXT) \ |
2117cc10 | 267 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)numpunct.$(OBJEXT) \ |
2117cc10 | 268 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)time_facets.$(OBJEXT) \ |
657a7cb1 | 269 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)messages.$(OBJEXT) \ |
270 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_impl.$(OBJEXT) \ | |
271 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale.$(OBJEXT) \ | |
272 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)locale_catalog.$(OBJEXT) \ | |
273 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)facets_byname.$(OBJEXT) \ | |
274 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale.$(OBJEXT) \ | |
275 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)c_locale_stub.$(OBJEXT) \ | |
276 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex.$(OBJEXT) \ | |
277 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_exp.$(OBJEXT) \ | |
278 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io.$(OBJEXT) \ | |
279 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_trig.$(OBJEXT) \ | |
2117cc10 | 280 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)complex_io_w.$(OBJEXT) \ |
2117cc10 | 281 | -$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)string_w.$(OBJEXT) \ |
2117cc10 | 282 | -$(RESFILE_stldebug) |
283 | - | |
2117cc10 | 284 | |
657a7cb1 | 285 | diff -Nur STLport-4.5.1/src/common_rules.mak STLport-4.5.1.new/src/common_rules.mak |
286 | --- STLport-4.5.1/src/common_rules.mak Mon Oct 8 19:30:30 2001 | |
287 | +++ STLport-4.5.1.new/src/common_rules.mak Sat Dec 15 23:04:26 2001 | |
288 | @@ -81,11 +81,7 @@ | |
289 | ||
290 | symbolic_links : | |
291 | $(RM) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) | |
292 | - $(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) | |
293 | - $(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) | |
294 | ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT) | |
295 | - -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) | |
296 | - ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) | |
297 | ||
298 | install_unix : | |
299 | -$(RM) $(INSTALLDIR_INC) | |
300 | @@ -112,9 +108,7 @@ | |
301 | $(INSTALL_LIB) $$file $(INSTALLDIR_LIB); \ | |
302 | done | |
303 | $(RM) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT) | |
304 | - $(RM) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT) | |
305 | ln -s $(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT) | |
306 | - ln -s $(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT) | |
307 | ||
308 | # ln -s $(INSTALLDIR_LIB)/$(RELEASE_DYNLIB) $(INSTALLDIR_LIB)/$(RELEASE_NAME).$(DYNEXT) | |
309 | # ln -s $(INSTALLDIR_LIB)/$(STLDEBUG_DYNLIB) $(INSTALLDIR_LIB)/$(STLDEBUG_NAME).$(DYNEXT) | |
310 | @@ -134,24 +128,6 @@ | |
311 | $(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) : $(OUTDIR) $(RELEASE_OBJDIR_staticx) $(DEF_FILE) $(RELEASE_OBJECTS_staticx) | |
312 | $(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(RELEASEX_LIB) $(LDFLAGS_RELEASE_static) $(RELEASE_OBJECTS_staticx) $(LDLIBS_RELEASE_static) | |
2117cc10 | 313 | |
2117cc10 | 314 | -$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) : $(OUTDIR) $(DEBUG_OBJDIR_dynamic) $(DEF_FILE) $(DEBUG_OBJECTS_dynamic) |
315 | - $(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB) $(LDFLAGS_DEBUG_dynamic) $(DEBUG_OBJECTS_dynamic) $(LDLIBS_DEBUG_dynamic) | |
316 | - | |
317 | -$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) : $(OUTDIR) $(DEBUG_OBJDIR_static) $(DEF_FILE) $(DEBUG_OBJECTS_static) | |
318 | - $(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUG_LIB) $(LDLIBS_DEBUG_static) $(LDFLAGS_DEBUG_static) $(DEBUG_OBJECTS_static) | |
319 | - | |
657a7cb1 | 320 | -$(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB) : $(OUTDIR) $(DEBUG_OBJDIR_staticx) $(DEF_FILE) $(DEBUG_OBJECTS_staticx) |
321 | - $(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(DEBUGX_LIB) $(LDLIBS_DEBUG_static) $(LDFLAGS_DEBUG_static) $(DEBUG_OBJECTS_staticx) | |
322 | - | |
2117cc10 | 323 | -$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_dynamic) $(DEF_FILE) $(STLDEBUG_OBJECTS_dynamic) |
324 | - $(DYN_LINK) $(DYNLINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) $(LDFLAGS_STLDEBUG_dynamic) $(STLDEBUG_OBJECTS_dynamic) $(LDLIBS_STLDEBUG_dynamic) | |
325 | - | |
326 | -$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_static) $(DEF_FILE) $(STLDEBUG_OBJECTS_static) | |
327 | - $(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUG_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_static) $(LDLIBS_STLDEBUG_static) | |
328 | - | |
657a7cb1 | 329 | -$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) : $(OUTDIR) $(STLDEBUG_OBJDIR_staticx) $(DEF_FILE) $(STLDEBUG_OBJECTS_staticx) |
330 | - $(LINK) $(LINK_OUT)$(OUTDIR)$(PATH_SEP)$(STLDEBUGX_LIB) $(LDFLAGS_STLDEBUG_static) $(STLDEBUG_OBJECTS_staticx) $(LDLIBS_STLDEBUG_static) | |
331 | - | |
332 | # locale_impl.cpp : codecvt.cpp collate.cpp ctype.cpp monetary.cpp num_get.cpp num_get_float.cpp num_put.cpp num_put_float.cpp numpunct.cpp time_facets.cpp messages.cpp | |
333 | ||
334 | # locale_catalog.cpp : ctype_byname.cpp collate_byname.cpp codecvt_byname.cpp numpunct_byname.cpp monetary_byname.cpp messages_byname.cpp | |
335 | diff -Nur STLport-4.5.1/src/gcc.mak STLport-4.5.1.new/src/gcc.mak | |
336 | --- STLport-4.5.1/src/gcc.mak Sat Dec 1 22:00:18 2001 | |
337 | +++ STLport-4.5.1.new/src/gcc.mak Sat Dec 15 22:48:31 2001 | |
338 | @@ -38,14 +38,8 @@ | |
2117cc10 | 339 | |
340 | CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} | |
341 | ||
342 | -CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 | |
343 | -CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC | |
344 | - | |
657a7cb1 | 345 | -CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g |
346 | -CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC | |
2117cc10 | 347 | - |
657a7cb1 | 348 | -CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG |
349 | -CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG | |
2117cc10 | 350 | +CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) $(CXXFLAGS) |
351 | +CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) $(CXXFLAGS) -fPIC | |
352 | ||
353 | include common_percent_rules.mak | |
354 | include common_rules.mak |