diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
| commit | 62b43447cd591f55b652f3a6b01015aa3590f0b8 (patch) | |
| tree | 831f0a0fa7a3ef2eac555fc8fcd1f0dc31c4eea0 /vos | |
| parent | c34303fde355d8217c10e1355ed28965ef49a9d0 (diff) | |
Updated to SRC614
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/source/makefile.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index f8f9d951d93b..408b2efc8df3 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: obr $ $Date: 2000-11-06 14:09:56 $ +# last change: $Author: pluby $ $Date: 2000-12-14 07:35:19 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -136,14 +136,6 @@ OBJFILES= $(OBJ)$/acceptor.obj \ # $(SLO)$/evtque.obj .ENDIF -# 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)$/staticmb.obj -OBJFILES+=$(OBJ)$/staticmb.obj -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |