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

8 files changed, 16 insertions, 70 deletions

diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index b631d04facb7..061104175a0f 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 ed0598ba8b67..498d6a9394a1 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 2b779872f803..22701796f34b 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 2da4d63eed02..9dc948a6ea83 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 ee15d2675d9c..08e095590bf4 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 ce40668fb8ff..ea741a1d8bbf 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 c271b16907ac..aee577e34cbe 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 fde2e0d55a5d..acdcbe6097d3 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