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

22 files changed, 44 insertions, 186 deletions

diff --git a/comphelper/source/container/makefile.mk b/comphelper/source/container/makefile.mk
index cf1d9c91d56d..c4369c4e46fd 100644
--- a/comphelper/source/container/makefile.mk
+++ b/comphelper/source/container/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:30:19 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,11 +77,6 @@ SLOFILES=\
             $(SLO)$/enumhelper.obj	\
             $(SLO)$/container.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)$/staticmbcontainer.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/comphelper/source/eventattachermgr/makefile.mk b/comphelper/source/eventattachermgr/makefile.mk
index 5f139c453bd2..7d79358d1188 100644
--- a/comphelper/source/eventattachermgr/makefile.mk
+++ b/comphelper/source/eventattachermgr/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:30:20 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:10 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -103,11 +103,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 SLOFILES=	$(SLO)$/eventattachermgr.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)$/staticmbeventattachermgr.obj 
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index d313c3830774..667be9f1ba6c 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:30:20 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,11 +80,6 @@ SLOFILES=	$(SLO)$/interaction.obj \
             $(SLO)$/querydeep.obj \
             $(SLO)$/regpathhelper.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)$/staticmbinteraction.obj 
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/comphelper/source/property/makefile.mk b/comphelper/source/property/makefile.mk
index 67fe2f5d0d4c..1632c7912110 100644
--- a/comphelper/source/property/makefile.mk
+++ b/comphelper/source/property/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:30:21 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:20 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,11 +80,6 @@ SLOFILES=	$(SLO)$/composedprops.obj \
             $(SLO)$/propstate.obj \
             $(SLO)$/propertycontainer.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)$/staticmbproperty.obj 
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk
index e82aad774aaf..0eb4efb3731f 100644
--- a/comphelper/source/streaming/makefile.mk
+++ b/comphelper/source/streaming/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 17:30:21 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:26 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,11 +77,6 @@ SLOFILES=	$(SLO)$/basicio.obj \
             $(SLO)$/seqstream.obj	\
             $(SLO)$/streamsection.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)$/staticmbstreaming.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/goodies/source/filter.vcl/icgm/makefile.mk b/goodies/source/filter.vcl/icgm/makefile.mk
index 77165ef7c266..452992ca0713 100644
--- a/goodies/source/filter.vcl/icgm/makefile.mk
+++ b/goodies/source/filter.vcl/icgm/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-01-02 23:22:09 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:45 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -155,15 +155,6 @@ SLOFILES =	$(SLO)$/cgm.obj		\
             $(SLO)$/elements.obj
 #			$(SLO)$/svdem.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 m ultiple defined symbols
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
-SLOFILES+=$(SLO)$/staticmbicgm.obj
-.ENDIF
-
-
-
 SHL1TARGET	=	icg$(UPD)$(DLLPOSTFIX)
 SHL1IMPLIB	=	icgm
 SHL1DEPN	=	$(LB)$/icgm.lib
diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk
index 9235370c1e08..eb39cf170f28 100644
--- a/sax/source/expatwrap/makefile.mk
+++ b/sax/source/expatwrap/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-17 09:23:00 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:16:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,11 +83,6 @@ SLOFILES =\
 SYMBOLPREFIX=sax
 .ENDIF
 
-# 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)$/staticmb.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 .INCLUDE :	target.mk
 
diff --git a/sax/test/makefile.mk b/sax/test/makefile.mk
index 8a99b351d6b2..cfe8b942e355 100644
--- a/sax/test/makefile.mk
+++ b/sax/test/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-15 01:11:31 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:16:46 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -94,11 +94,6 @@ APP2STDLIBS = 	$(SALLIB) \
         $(CPPULIB) \
         $(CPPUHELPERLIB)
 
-# 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"
-APP2OBJS+=$(OBJ)$/staticmbtest.obj   
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sax/test/sax/makefile.mk b/sax/test/sax/makefile.mk
index af953edabe3a..7ac851d45938 100644
--- a/sax/test/sax/makefile.mk
+++ b/sax/test/sax/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-15 01:11:32 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:16:43 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,11 +76,6 @@ ENABLE_EXCEPTIONS=TRUE
 SLOFILES = 	$(SLO)$/testsax.obj \
         $(SLO)$/testwriter.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)$/staticmbtestsax.obj
-.ENDIF
-
 SHL1TARGET= $(TARGET)
 SHL1IMPLIB=		i$(TARGET)
 
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
index 512a5ce421d1..d8f74ca76d2b 100644
--- a/svtools/source/config/makefile.mk
+++ b/svtools/source/config/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.20 $
+#   $Revision: 1.21 $
 #
-#   last change: $Author: tl $ $Date: 2001-02-19 10:59:28 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:21 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -95,13 +95,6 @@ SLOFILES = \
     $(SLO)$/defaultoptions.obj			\
     $(SLO)$/searchopt.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)$/staticmbconfig.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svtools/source/numbers/makefile.mk b/svtools/source/numbers/makefile.mk
index 25b81fb27c14..b8ec63f6ba48 100644
--- a/svtools/source/numbers/makefile.mk
+++ b/svtools/source/numbers/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 18:46:27 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:23 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -116,11 +116,6 @@ EXCEPTIONSFILES= \
         $(SLO)$/numfmuno.obj \
         $(SLO)$/supservs.obj
 
-# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symb ols
-.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
-SLOFILES+=$(SLO)$/staticmbnumbers.obj
-.ENDIF
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 1c85dda6f8f5..5d22127b519b 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 18:45:40 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:27 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -254,12 +254,6 @@ LIB1OBJFILES=  \
             $(SLO)$/unoiface.obj	\
             $(SLO)$/imgprod.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)$/staticmbuno.obj
-LIB1OBJFILES+=$(SLO)$/staticmbuno.obj
-.ENDIF
-
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
index fe63e189639d..3b60c5ef06b7 100644
--- a/toolkit/source/awt/makefile.mk
+++ b/toolkit/source/awt/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 18:21:41 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -91,11 +91,6 @@ SLOFILES=   \
             $(SLO)$/vclxwindow.obj 					\
             $(SLO)$/vclxwindows.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)$/staticmbawt.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/toolkit/source/controls/makefile.mk b/toolkit/source/controls/makefile.mk
index b4607437c70b..6d03ff9ac33c 100644
--- a/toolkit/source/controls/makefile.mk
+++ b/toolkit/source/controls/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: ab $ $Date: 2001-02-21 17:37:21 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -87,11 +87,6 @@ SLOFILES=   \
             $(SLO)$/unocontrolmodel.obj 			\
             $(SLO)$/unocontrols.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)$/staticmbcontrols.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/ucbhelper/source/client/makefile.mk b/ucbhelper/source/client/makefile.mk
index 1b066120550c..fa0acdf3fc00 100644
--- a/ucbhelper/source/client/makefile.mk
+++ b/ucbhelper/source/client/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: kso $ $Date: 2001-02-05 15:52:01 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:22 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -87,13 +87,6 @@ SLOFILES=\
 
 .ENDIF
 
-# 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)$/staticmbclient.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk
index 943f9b3941a4..59db770032a4 100644
--- a/ucbhelper/source/provider/makefile.mk
+++ b/ucbhelper/source/provider/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: kso $ $Date: 2001-02-12 11:56:23 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -95,13 +95,6 @@ SLOFILES=\
 
 .ENDIF
 
-# 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)$/staticmbprovider.obj
-.ENDIF
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
index bf411abaa6ac..e45e3cbcd1a1 100644
--- a/unotools/source/config/makefile.mk
+++ b/unotools/source/config/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:13 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -97,15 +97,6 @@ SLOFILES=\
         $(SLO)$/configitem.obj \
         $(SLO)$/configmgr.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)$/staticmbconfig.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/unotools/source/i18n/makefile.mk b/unotools/source/i18n/makefile.mk
index bf5144a7700c..32c6cd3bcf31 100644
--- a/unotools/source/i18n/makefile.mk
+++ b/unotools/source/i18n/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: jp $ $Date: 2000-12-21 09:26:35 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -103,14 +103,6 @@ SLOFILES=	\
     $(SLO)$/transliterationwrapper.obj \
     $(SLO)$/textsearch.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)$/staticmbi18n.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk
index 7b3368b494e5..b9b4d7a47e59 100644
--- a/unotools/source/misc/makefile.mk
+++ b/unotools/source/misc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-12 01:33:49 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -100,12 +100,6 @@ UNOUCROUT=$(OUT)$/inc
 SLOFILES=	$(SLO)$/atom.obj \
             $(SLO)$/datetime.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)$/staticmbatom.obj 
-.ENDIF
-
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/unotools/source/streaming/makefile.mk b/unotools/source/streaming/makefile.mk
index d3a0c0bcc2bd..f934f6dfc7cb 100644
--- a/unotools/source/streaming/makefile.mk
+++ b/unotools/source/streaming/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: hr $ $Date: 2000-11-07 09:47:31 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -96,15 +96,6 @@ ENABLE_EXCEPTIONS=TRUE
 SLOFILES= $(SLO)$/streamhelper.obj        \
         $(SLO)$/streamwrap.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)$/staticmbstreaming.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/unotools/source/ucbhelper/makefile.mk b/unotools/source/ucbhelper/makefile.mk
index 7c7347f48266..16c7a0e329c7 100644
--- a/unotools/source/ucbhelper/makefile.mk
+++ b/unotools/source/ucbhelper/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: mba $ $Date: 2001-01-17 13:55:23 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -99,15 +99,6 @@ SLOFILES=\
                         $(SLO)$/ucbstreamhelper.obj \
                         $(SLO)$/tempfile.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)$/staticmbucbhelper.obj
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk
index 69ba03e4c382..78ed64b021c8 100644
--- a/vos/source/makefile.mk
+++ b/vos/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-12 01:33:45 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -98,11 +98,6 @@ SLOFILES=       $(SLO)$/acceptor.obj    \
                 $(SLO)$/xception.obj	\
                 $(SLO)$/evtque.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)$/staticmb.obj
-.ENDIF
-
 # $(SLO)$/evtque.obj
 
 .IF "$(GUI)"=="WIN"
@@ -137,11 +132,6 @@ OBJFILES=       $(OBJ)$/acceptor.obj    \
                 $(OBJ)$/xception.obj	\
                 $(OBJ)$/evtque.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"
-OBJFILES+=$(OBJ)$/staticmb.obj
-.ENDIF
-
 # $(SLO)$/evtque.obj
 .ENDIF