| 57856ccb |
1 | --- oo/tools/bootstrp/static.mk.orig Wed Jan 22 22:54:04 2003 |
| 2 | +++ oo/tools/bootstrp/static.mk Wed Jan 22 22:54:27 2003 |
| 3 | @@ -2,9 +2,9 @@ |
| 4 | # |
| 5 | # $RCSfile$ |
| 6 | # |
| 7 | -# $Revision$ |
| 8 | +# $Revision$ |
| 9 | # |
| 10 | -# last change: $Author$ $Date$ |
| 11 | +# last change: $Author$ $Date$ |
| 12 | # |
| 13 | # The Contents of this file are made available subject to the terms of |
| 14 | # either of the following licenses |
| 15 | @@ -60,11 +60,21 @@ |
| 16 | # |
| 17 | #************************************************************************* |
| 18 | |
| 19 | +.IF "$(OFFICEUPD)"=="" |
| 20 | +STATICUPD=$(UPD) |
| 21 | +.ELSE |
| 22 | +STATICUPD=$(OFFICEUPD) |
| 23 | +.ENDIF |
| 24 | + |
| 25 | .IF "$(GUI)"=="WNT" |
| 26 | # ----------------------------------------------------------- |
| 27 | # --------------------- Windows32 --------------------------- |
| 28 | # ----------------------------------------------------------- |
| 29 | -SALLIBST = $(SALLIB) |
| 30 | +#.IF "$(STATICUPD)" >= 640 |
| 31 | +#SALLIBST = $(SALLIB) |
| 32 | +#.ELSE |
| 33 | +SALLIBST = asal.lib |
| 34 | +#.ENDIF |
| 35 | BOOTSTRP = bootstrp.lib |
| 36 | TRANSEX = transex.lib |
| 37 | VERMAP = bsvermap.lib |
| 38 | @@ -81,20 +91,10 @@ |
| 39 | .ELSE |
| 40 | STATIC_LIBS += atools.lib |
| 41 | .ENDIF |
| 42 | -.IF "$(UPD)" >= "590" |
| 43 | -STATIC_LIBS += kernel9x.lib \ |
| 44 | - advapi9x.lib \ |
| 45 | - shell9x.lib |
| 46 | -.IF "$(UPD)" >= "604" |
| 47 | -STATIC_LIBS += tools32.lib |
| 48 | -.ENDIF |
| 49 | -.ENDIF |
| 50 | -.IF "$(UPD)" >= "546" |
| 51 | -STATIC_LIBS += $(SALLIB) |
| 52 | -.ELSE |
| 53 | -STATIC_LIBS += aosl.lib \ |
| 54 | - artl.lib |
| 55 | -.ENDIF |
| 56 | +STATIC_LIBS += uwinapi.lib \ |
| 57 | + ascii_expat_xmlparse.lib \ |
| 58 | + expat_xmltok.lib \ |
| 59 | + $(SALLIB) |
| 60 | .IF "$(LIBSTLPORT)" != "" |
| 61 | STATIC_LIBS += $(LIBSTLPORT) |
| 62 | .ENDIF |
| 63 | @@ -123,16 +123,9 @@ |
| 64 | $(LIBSTLPORTST) \ |
| 65 | $(STATIC) |
| 66 | |
| 67 | -.IF "$(UPD)" >= "546" |
| 68 | -.IF "$(UPD)" >= "604" |
| 69 | -STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX) |
| 70 | -.ELSE |
| 71 | -STATIC_LIBS += -lsal$(UPD)$(DLLPOSTFIX) |
| 72 | -.ENDIF |
| 73 | -.ELSE |
| 74 | -STATIC_LIBS += -losl$(UPD)$(DLLPOSTFIX) \ |
| 75 | - -lrtl$(UPD)$(DLLPOSTFIX) |
| 76 | -.ENDIF |
| 77 | +STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX) \ |
| 78 | + -lascii_expat_xmlparse \ |
| 79 | + -lexpat_xmltok |
| 80 | |
| 81 | .IF "$(COM)"=="C52" |
| 82 | .IF "$(BUILD_SOSL)"=="" |
| 83 | @@ -148,8 +141,14 @@ |
| 84 | STATIC_LIBS += -lnsl -lsocket -lposix4 -lc |
| 85 | .ENDIF |
| 86 | .IF "$(OS)"=="LINUX" |
| 87 | -STATIC_LIBS += -lsupc++ -lX11 -lXext |
| 88 | -.ENDIF |
| 89 | +.IF "$(COM)"=="GCC" |
| 90 | +.IF "$(CVER)"!="C295" |
| 91 | +STATIC_LIBS += -lsupc++ -lX11 -lXext |
| 92 | +.ELSE |
| 93 | +STATIC_LIBS += -lX11 -lXext |
| 94 | +.ENDIF # CVER |
| 95 | +.ENDIF # GCC |
| 96 | +.ENDIF # LINUX |
| 97 | |
| 98 | # ----------------------------------------------------------- |
| 99 | |
| 100 | @@ -162,12 +161,7 @@ |
| 101 | VERMAP = bsvermap.lib |
| 102 | STATIC_LIBS = $(L)$/atools.lib \ |
| 103 | $(L)$/avos.lib |
| 104 | -.IF "$(UPD)" >= "546" |
| 105 | STATIC_LIBS += $(L)$/asal.lib |
| 106 | -.ELSE |
| 107 | -STATIC_LIBS += $(L)$/aosl.lib \ |
| 108 | - $(L)$/artl.lib |
| 109 | -.ENDIF |
| 110 | # ----------------------------------------------------------- |
| 111 | |
| 112 | .ENDIF |
projects / packages / libreoffice.git / blame