diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 18:16:28 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 18:16:28 +0000 |
| commit | f0a38ae933956488d3dfac64718528b04ea23702 (patch) | |
| tree | 39d9941df0f6b1d6ae102bd0fbbc7beba14ce363 /UnoControls/source/base | |
| parent | 3aefc5bba9737f5609d5e5e265113eead7f3a379 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'UnoControls/source/base')
| -rw-r--r-- | UnoControls/source/base/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk index 266225ff1109..e0297b494652 100644 --- a/UnoControls/source/base/makefile.mk +++ b/UnoControls/source/base/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: pluby $ $Date: 2000-10-06 16:30:31 $ +# last change: $Author: svesik $ $Date: 2001-02-02 19:16:27 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,10 +78,8 @@ SLOFILES= $(SLO)$/multiplexer.obj \ $(SLO)$/basecontainercontrol.obj \ $(SLO)$/registercontrols.obj -# 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" +.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmbbase.obj .ENDIF |