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 | e2efb71af3be53598a4ae78dd145c2567d559736 (patch) | |
tree | e96f95b9bf2acb4b9752cd648c8bc2805cb3076f /vos/source | |
parent | 46f9afe549487c4070c4bd9b1ae7d6827c941abd (diff) |
Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process
Diffstat (limited to 'vos/source')
-rw-r--r-- | vos/source/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index 69ba03e4c382..78ed64b021c8 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: pluby $ $Date: 2001-02-12 01:33:45 $ +# last change: $Author: pluby $ $Date: 2001-03-02 07:21:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,11 +98,6 @@ SLOFILES= $(SLO)$/acceptor.obj \ $(SLO)$/xception.obj \ $(SLO)$/evtque.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 - # $(SLO)$/evtque.obj .IF "$(GUI)"=="WIN" @@ -137,11 +132,6 @@ OBJFILES= $(OBJ)$/acceptor.obj \ $(OBJ)$/xception.obj \ $(OBJ)$/evtque.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" -OBJFILES+=$(OBJ)$/staticmb.obj -.ENDIF - # $(SLO)$/evtque.obj .ENDIF |