diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:14:07 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:14:07 +0000 |
| commit | 86a24cf93a3c4d1c48fd55dfb6cec4998355c70e (patch) | |
| tree | 0d9451530cf74bdff9fa629bb9d745c609d2395d /io | |
| parent | 32c145642a705c5e336137348c78059d20b493e9 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/connector/makefile.mk | 8 | ||||
| -rw-r--r-- | io/source/stm/makefile.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index 15d74af14d13..9d1d85a01b71 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:47:35 $ +# last change: $Author: svesik $ $Date: 2001-02-02 17:12:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,10 +86,8 @@ SLOFILES= \ $(SLO)$/ctr_pipe.obj\ $(SLO)$/ctr_socket.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)$/staticmbconnector.obj .ENDIF diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk index e7d3956331c1..e2cd7c4f4dc2 100644 --- a/io/source/stm/makefile.mk +++ b/io/source/stm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:49:41 $ +# last change: $Author: svesik $ $Date: 2001-02-02 17:14:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,10 +86,8 @@ SLOFILES = $(SLO)$/opipe.obj\ $(SLO)$/streamhelper.obj \ $(SLO)$/opump.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)$/staticmbstm.obj .ENDIF |