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

27 files changed, 54 insertions, 213 deletions

diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index 2b5d6adf1b..33545b31f0 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/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:43:39 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:12:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -88,11 +88,6 @@ OBJFILES=	\
 
 SRCFILES=	sb.src
 
-# 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/configmgr/source/registry/makefile.mk b/configmgr/source/registry/makefile.mk
index 7bc6e9d2e9..4659db78c3 100644
--- a/configmgr/source/registry/makefile.mk
+++ b/configmgr/source/registry/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:16:57 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,13 +76,6 @@ SLOFILES=\
         $(SLO)$/configregistry.obj \
         $(SLO)$/cfgregistrykey.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
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index b631d04fac..061104175a 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-23 22:01:37 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:31 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -171,12 +171,6 @@ SLOFILES=\
         $(SLO)$/OFunctions.obj					\
         $(SLO)$/OConnection.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)$/staticmbadabas.obj
-SLOFILES+=$(SLO)$/staticmbodbc.obj
-.ENDIF
-
 .IF "$(OS)"=="MACOSX"
 #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
 .ELSE      
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index ed0598ba8b..498d6a9394 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-23 22:01:37 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -112,12 +112,6 @@ SLOFILES=\
     $(SLO)$/Dservices.obj			\
     $(SLO)$/DDriver.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)$/staticmbdbase.obj
-SLOFILES+=$(SLO)$/staticmbodbc.obj
-.ENDIF
-
 .IF "$(OS)"=="MACOSX"
 #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
 .ELSE      
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 2b779872f8..22701796f3 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-01-30 16:48:38 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -153,12 +153,6 @@ SLOFILES=\
     $(SLO)$/fanalyzer.obj			\
     $(SLO)$/fcode.obj				\
     $(SLO)$/fcomp.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)$/staticmbfile.obj
-.ENDIF
 
 # --- Targets ----------------------------------
 
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 2da4d63eed..9dc948a6ea 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-23 22:01:38 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:46 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -105,12 +105,6 @@ SLOFILES=\
     $(SLO)$/Eservices.obj			\
     $(SLO)$/EDriver.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)$/staticmbflat.obj
-SLOFILES+=$(SLO)$/staticmbodbc.obj
-.ENDIF
-
 .IF "$(OS)"=="MACOSX"
 #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
 .ELSE      
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index ee15d2675d..08e095590b 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-23 22:01:38 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -157,13 +157,6 @@ SLOFILES=\
         $(SLO)$/tools.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)$/staticmbjdbc.obj
-SLOFILES+=$(SLO)$/staticmbodbc.obj
-.ENDIF
-
-
 .IF "$(OS)"=="MACOSX"
 #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
 .ELSE      
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index ce40668fb8..ea741a1d8b 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 16:33:39 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:13:57 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -149,11 +149,6 @@ SLOFILES=\
         $(SLO)$/oservices.obj					\
         $(SLO)$/OConnection.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)$/staticmbodbc.obj
-.ENDIF
-
 # --- Library -----------------------------------
 
 SHL1TARGET=	$(ODBC_TARGET)$(ODBC_MAJOR)
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index c271b16907..aee577e34c 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-23 22:01:38 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:01 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -109,11 +109,6 @@ SLOFILES=\
         $(SLO)$/mdrivermanager.obj			\
         $(SLO)$/registration.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)$/staticmbmanager.obj
-.ENDIF
-
 # --- Library -----------------------------------
 
 SHL1TARGET=	$(SDBC_TARGET)$(SDBC_MAJOR)
@@ -130,11 +125,6 @@ SHL1STDLIBS=\
     $(OSLLIB)					\
     $(SALLIB)
 
-# 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" 
-SHL1STDLIBS+=$(UCBHELPERLIB)
-.ENDIF
-
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
 
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index fde2e0d55a..acdcbe6097 100644
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-02-08 04:24:26 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -153,14 +153,6 @@ SLOFILES=\
         $(SLO)$/VCatalog.obj					\
         $(SLO)$/VView.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)$/staticmbsdbcx.obj
-.ENDIF
-        
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index 8f56ac6b07..04ac4568da 100644
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 19:06:24 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:22 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -104,10 +104,6 @@ UNOTYPES= \
 
 SLOFILES= \
         $(SLO)$/eventattacher.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
 
 SHL1TARGET=	$(TARGET)
 
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
index c0ccf5e318..d6a7232f6a 100644
--- a/fileaccess/source/makefile.mk
+++ b/fileaccess/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-12 01:33:46 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:14:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -79,11 +79,6 @@ SLOFILES= \
     $(SLO)$/FileAccess.obj 
 #	$(SLO)$/$(COMP1TYPELIST)_description.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
-
 SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index dfaeee1a2a..fcfea28c41 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-02-23 15:37:04 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:16:00 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -132,11 +132,6 @@ SLOFILES = \
         $(SLO)$/thesdsp.obj\
         $(SLO)$/lngreg.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
-
 SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index ec21d8690c..0d2b65e371 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: ab $ $Date: 2001-02-26 11:44:19 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:17:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -132,11 +132,6 @@ SLOFILES =  \
         $(SLO)$/newhelp.obj \
         $(SLO)$/helpinterceptor.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)$/staticmbappl.obj
-.ENDIF
-
 EXCEPTIONSFILES=\
         $(SLO)$/appmain.obj		\
         $(SLO)$/appmisc.obj		\
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
index 1da782280c..f94c602a4f 100644
--- a/sfx2/source/statbar/makefile.mk
+++ b/sfx2/source/statbar/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-02-22 03:51:48 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:17:21 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -94,11 +94,6 @@ SLOFILES =						\
         $(SLO)$/stbitem.obj     \
         $(SLO)$/progind.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)$/staticmbstatbar.obj
-.ENDIF
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
index 8f4be009db..a328776721 100644
--- a/sfx2/source/view/makefile.mk
+++ b/sfx2/source/view/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2001-02-22 03:50:48 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:17:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -110,11 +110,6 @@ SLOFILES =	\
         $(SLO)$/topfrm.obj \
         $(SLO)$/sfxbasecontroller.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)$/staticmbview.obj
-.ENDIF
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index a16a17981c..9ccb8feb45 100644
--- a/ucb/source/cacher/makefile.mk
+++ b/ucb/source/cacher/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 14:54:31 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -84,11 +84,6 @@ SLOFILES=\
     $(SLO)$/cacheddynamicresultset.obj \
     $(SLO)$/cacheserv.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)$/staticmbcacher.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 6507aacbb9..1a1633a1c7 100644
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: sb $ $Date: 2001-02-06 11:07:19 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:45 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,11 +83,6 @@ SLOFILES=\
     $(SLO)$/ucbcmds.obj \
     $(SLO)$/coreremotecontentbroker.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)$/staticmbucbcore.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
index f3d9afd95b..7c56e88c2a 100644
--- a/ucb/source/sorter/makefile.mk
+++ b/ucb/source/sorter/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: dv $ $Date: 2001-02-14 08:45:44 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:19:56 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,11 +80,6 @@ SLOFILES=\
     $(SLO)$/sortresult.obj \
     $(SLO)$/sortmain.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)$/staticmbsorter.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index 30c4309dbc..95623cdfd5 100644
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 14:42:36 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:01 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -84,11 +84,6 @@ SLOFILES=\
     $(SLO)$/filnot.obj   \
     $(SLO)$/filprp.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)$/staticmbfile.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk
index 5edca8724a..7b3d50f36b 100644
--- a/ucb/source/ucp/hierarchy/makefile.mk
+++ b/ucb/source/ucp/hierarchy/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 14:42:36 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -88,11 +88,6 @@ SLOFILES=\
     $(SLO)$/hierarchyurlcode.obj		\
     $(SLO)$/dynamicresultset.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)$/staticmbhierarchy.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 4fce041a23..b6a3baa8e7 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 14:42:37 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:20:17 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -109,11 +109,6 @@ SLOFILES=\
     $(SLO)$/DateTimeHelper.obj	\
     $(SLO)$/proxyconfig.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)$/staticmbwebdav.obj
-.ENDIF
-
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
 
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
index bcc8332e4a..60f6dd847a 100644
--- a/xmloff/source/chart/makefile.mk
+++ b/xmloff/source/chart/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: bm $ $Date: 2001-02-14 17:15:35 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,13 +86,6 @@ SLOFILES =	$(SLO)$/SchXMLExport.obj \
             $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \
             $(SLO)$/SchXMLAutoStylePoolP.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)$/staticmbchart.obj
-.ENDIF
-
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
index eb12ddf780..0aa8d34311 100644
--- a/xmloff/source/core/makefile.mk
+++ b/xmloff/source/core/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: svesik $ $Date: 2001-02-02 13:25:27 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:23 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -116,11 +116,6 @@ SLOFILES =	\
         $(SLO)$/ProgressBarHelper.obj	\
         $(SLO)$/PropertySetMerger.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
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
index 803d642fca..3f5c609147 100644
--- a/xmloff/source/forms/makefile.mk
+++ b/xmloff/source/forms/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.10 $
+#   $Revision: 1.11 $
 #
-#   last change: $Author: sab $ $Date: 2001-02-02 09:03:03 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:26 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -120,13 +120,6 @@ SLOFILES =	\
         $(SLO)$/formsimp.obj \
         $(SLO)$/strings.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)$/staticmbforms.obj
-.ENDIF
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
index 8df978251a..00fe5a89c9 100644
--- a/xmloff/source/style/makefile.mk
+++ b/xmloff/source/style/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.15 $
+#   $Revision: 1.16 $
 #
-#   last change: $Author: dvo $ $Date: 2001-02-21 19:28:48 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -248,14 +248,6 @@ SLOFILES =	\
         $(SLO)$/VisAreaExport.obj \
         $(SLO)$/VisAreaContext.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)$/staticmbstyle.obj
-.ENDIF
-
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
index ec9552ff59..4c30e0cafc 100644
--- a/xmloff/source/text/makefile.mk
+++ b/xmloff/source/text/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.25 $
+#   $Revision: 1.26 $
 #
-#   last change: $Author: dvo $ $Date: 2001-02-16 16:39:27 $
+#   last change: $Author: pluby $ $Date: 2001-03-02 07:21:44 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -236,13 +236,6 @@ SLOFILES =	\
         $(SLO)$/XMLStringBufferImportContext.obj \
         $(SLO)$/XMLTrackedChangesImportContext.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)$/staticmbtext.obj
-.ENDIF
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk