diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 13:26:41 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 13:26:41 +0000 |
| commit | 033fc33fe669d850e4fa08d3f97ce9184766594f (patch) | |
| tree | b8fee6c72a7aab2a3714cc6aacf0caff8680142a /stoc/source/proxy_factory | |
| parent | 06a925d65e31db9b8e7040e7242edc68a6e0fa8f (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'stoc/source/proxy_factory')
| -rw-r--r-- | stoc/source/proxy_factory/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk index 389b09a72ac9..6c8d0605de24 100644 --- a/stoc/source/proxy_factory/makefile.mk +++ b/stoc/source/proxy_factory/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hjs $ $Date: 2000-10-30 14:20:41 $ +# last change: $Author: svesik $ $Date: 2001-02-02 14:16:52 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,10 +80,8 @@ COMP1TYPELIST=$(TARGET) SLOFILES= \ $(SLO)$/proxyfac.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)$/staticmbproxy_factory.obj .ENDIF |