diff options
author | Gene Anaya <ganaya@openoffice.org> | 2000-10-13 17:00:29 +0000 |
---|---|---|
committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-13 17:00:29 +0000 |
commit | 9bdb6240aad7c2d9cf89508c309879807ccbac02 (patch) | |
tree | 9e921f0c74b24d53d80e99543c84fcdd76b43fd2 /io/source | |
parent | ce704a3137e1a5fd7a4a4b7b1de22c2bbf46ed43 (diff) |
Added several staticmbXXX.cxx files for mac os X build
Diffstat (limited to 'io/source')
-rw-r--r-- | io/source/TextInputStream/makefile.mk | 10 | ||||
-rw-r--r-- | io/source/TextOutputStream/makefile.mk | 10 | ||||
-rw-r--r-- | io/source/acceptor/makefile.mk | 10 | ||||
-rw-r--r-- | io/source/connector/makefile.mk | 10 | ||||
-rw-r--r-- | io/source/stm/makefile.mk | 10 |
5 files changed, 40 insertions, 10 deletions
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk index 058081f9b053..3d61453c6148 100644 --- a/io/source/TextInputStream/makefile.mk +++ b/io/source/TextInputStream/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2000-09-18 23:16:57 $ +# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:28 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,6 +75,12 @@ NO_BSYMBOLIC=TRUE SLOFILES= \ $(SLO)$/TextInputStream.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" +SLOFILES+=$(SLO)$/staticmbTextInputStream.obj +.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk index a3fdcc81c1aa..6b2580fa6941 100644 --- a/io/source/TextOutputStream/makefile.mk +++ b/io/source/TextOutputStream/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2000-09-18 23:17:34 $ +# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,6 +75,12 @@ NO_BSYMBOLIC=TRUE SLOFILES= \ $(SLO)$/TextOutputStream.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" +SLOFILES+=$(SLO)$/staticmbTextOutputStream.obj +.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk index b8b9871d2779..fea8a1268482 100644 --- a/io/source/acceptor/makefile.mk +++ b/io/source/acceptor/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:24:18 $ +# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,6 +87,12 @@ SLOFILES= \ $(SLO)$/acc_pipe.obj \ $(SLO)$/acc_socket.obj \ $(SLO)$/$(COMP1TYPELIST)_description.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" +SLOFILES+=$(SLO)$/staticmbacceptor.obj +.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk index c713dea1b331..d87583d16276 100644 --- a/io/source/connector/makefile.mk +++ b/io/source/connector/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:24:18 $ +# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,6 +88,12 @@ SLOFILES= \ $(SLO)$/ctr_socket.obj\ $(SLO)$/ctr_channel.obj \ $(SLO)$/$(COMP1TYPELIST)_description.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" +SLOFILES+=$(SLO)$/staticmbconnector.obj +.ENDIF SHL1TARGET= $(TARGET) diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk index d93a835998be..0ee19bcbd6ef 100644 --- a/io/source/stm/makefile.mk +++ b/io/source/stm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:24:18 $ +# last change: $Author: ganaya $ $Date: 2000-10-13 18:00:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,6 +80,12 @@ SLOFILES = $(SLO)$/opipe.obj\ $(SLO)$/streamhelper.obj \ $(SLO)$/opump.obj \ $(SLO)$/$(COMP1TYPELIST)_description.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" +SLOFILES+=$(SLO)$/staticmbstm.obj +.ENDIF SHL1TARGET= $(TARGET) |