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