Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process

5 files changed, 10 insertions, 38 deletions

diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index fa048bbfe..77d8fb492 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/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:51:33 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:15:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,12 +89,6 @@ UNOTYPES=	com.sun.star.io.XTextInputStream \
 
 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 e01dfc240..06c3294c0 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/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:52:21 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:15:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -88,12 +88,6 @@ UNOTYPES=	com.sun.star.io.XTextOutputStream \
 
 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 21021ff4a..76ea9cc16 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:02:45 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:15:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,12 +86,6 @@ SLOFILES= \
         $(SLO)$/acc_pipe.obj \
         $(SLO)$/acc_socket.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)"=="MACOSX" 
-SLOFILES+=$(SLO)$/staticmbacceptor.obj
-.ENDIF
-
-
 SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index 9d1d85a01..19db2ec7e 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:12:03 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:15:40 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,11 +86,6 @@ SLOFILES= \
     $(SLO)$/ctr_pipe.obj\
     $(SLO)$/ctr_socket.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)"=="MACOSX" 
-SLOFILES+=$(SLO)$/staticmbconnector.obj
-.ENDIF
-
 SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index e2cd7c4f4..cef1ffeb2 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:14:07 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:15:46 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,11 +86,6 @@ SLOFILES = 	$(SLO)$/opipe.obj\
         $(SLO)$/streamhelper.obj \
         $(SLO)$/opump.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)"=="MACOSX" 
-SLOFILES+=$(SLO)$/staticmbstm.obj
-.ENDIF
-
 SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \