diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-03-02 06:21:44 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-03-02 06:21:44 +0000 |
| commit | 5edfb08ec6e740cdc65d78e1dce446592a8549ad (patch) | |
| tree | 33a16c183fd8f9d3c2f1b2b9deafa52462ca2f12 /UnoControls | |
| parent | 25545cf5bf7c8e2d630132dbcbdb221c68e01a83 (diff) | |
Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
Diffstat (limited to 'UnoControls')
| -rw-r--r-- | UnoControls/source/base/makefile.mk | 9 | ||||
| -rw-r--r-- | UnoControls/source/controls/makefile.mk | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk index e0297b494..24d99245a 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 0c2cca68c..c07e6d09d 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 |