diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:09:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:09:37 +0000 |
| commit | 777e96d117c70ccff5a3fe88f8b8e10899863d27 (patch) | |
| tree | bc1cc963cf37d593ce0478f4b9dcf9bc569825f4 /salhelper | |
| parent | 30251226fba528caabc317e4b6517007232eddb2 (diff) | |
INTEGRATION: CWS geordi2q14 (1.17.30); FILE MERGED
2004/01/29 18:32:59 hr 1.17.30.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 2c25fef99..aa035a58c 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: hr $ $Date: 2003-07-16 17:30:45 $ +# last change: $Author: hr $ $Date: 2004-02-02 18:09:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,8 +86,8 @@ SLOFILES= \ $(SLO)$/dynload.obj \ $(SLO)$/simplereferenceobject.obj -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)$(CVER)"=="MACOSXC295" +# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF |