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

6 files changed, 12 insertions, 42 deletions

diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index a16a17981c67..9ccb8feb4522 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 6507aacbb97a..1a1633a1c718 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 f3d9afd95bce..7c56e88c2a5a 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 30c4309dbc73..95623cdfd50c 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 5edca8724a80..7b3d50f36bf1 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 4fce041a23b0..b6a3baa8e703 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)