summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-03-02 06:21:44 +0000
committerPatrick Luby <pluby@openoffice.org>2001-03-02 06:21:44 +0000
commitfe31295811af15fb848d9e276e6f666a882e3e1e (patch)
tree39b26e9b9f8442a3bac86df70caf7136997409c3
parent235898427cb81da0747466c43876e6385b324e06 (diff)
Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
-rw-r--r--UnoControls/source/base/makefile.mk9
-rw-r--r--UnoControls/source/controls/makefile.mk9
-rw-r--r--extensions/source/resource/makefile.mk9
3 files changed, 6 insertions, 21 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index e0297b494652..24d99245ab3a 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: svesik $ $Date: 2001-02-02 19:16:27 $
+# last change: $Author: pluby $ $Date: 2001-03-02 07:12:46 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -78,11 +78,6 @@ SLOFILES= $(SLO)$/multiplexer.obj \
$(SLO)$/basecontainercontrol.obj \
$(SLO)$/registercontrols.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)$/staticmbbase.obj
-.ENDIF
-
#LIB1TARGET= $(SLB)$/$(TARGET).lib
#LIB1OBJFILES= $(SLOFILES)
diff --git a/UnoControls/source/controls/makefile.mk b/UnoControls/source/controls/makefile.mk
index 0c2cca68c869..c07e6d09dc21 100644
--- a/UnoControls/source/controls/makefile.mk
+++ b/UnoControls/source/controls/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: svesik $ $Date: 2001-02-02 19:16:28 $
+# last change: $Author: pluby $ $Date: 2001-03-02 07:12:47 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,10 +77,5 @@ SLOFILES=\
$(SLO)$/OConnectionPointContainerHelper.obj \
$(SLO)$/statusindicator.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/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index 4d8b4487a80e..5d2d2696edb2 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/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:55:15 $
+# last change: $Author: pluby $ $Date: 2001-03-02 07:14:30 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -80,11 +80,6 @@ SLOFILES= $(SLO)$/resource.obj
EXCEPTIONSFILES= $(SLO)$/resource.obj
-# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore m ultiple defined symbols
-.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX"
-EXCEPTIONSFILES+=$(SLO)$/staticmbresource.obj
-.ENDIF
-
LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1OBJFILES= $(EXCEPTIONSFILES)