diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:34:02 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:34:02 +0000 |
| commit | 676d6f93207b2b4ac53d924b8bbc2574778669a9 (patch) | |
| tree | 5caa61d8a97dad84abb231a917890dcb150c5be6 /comphelper/source/streaming | |
| parent | 7b7ba81ca8c65d7b9f84550fb9fdcac71fffb933 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'comphelper/source/streaming')
| -rw-r--r-- | comphelper/source/streaming/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk index 6696b506708d..e82aad774aaf 100644 --- a/comphelper/source/streaming/makefile.mk +++ b/comphelper/source/streaming/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: pluby $ $Date: 2000-10-07 21:13:53 $ +# last change: $Author: svesik $ $Date: 2001-02-02 17:30:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,10 +77,8 @@ SLOFILES= $(SLO)$/basicio.obj \ $(SLO)$/seqstream.obj \ $(SLO)$/streamsection.obj \ -# NETBSD: somewhere we have to instantiate the static data members. -# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work. # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbstreaming.obj .ENDIF |