diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 18:39:41 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 18:39:41 +0000 |
| commit | 104dd3b50ddf63b68115cf8963ca1c447e50a902 (patch) | |
| tree | fb211e1853890d6d53724cd3818a00b593c8fb12 /javaunohelper/source | |
| parent | dbdfbb60ff769775a3133582f25a75c5e9caa332 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'javaunohelper/source')
| -rw-r--r-- | javaunohelper/source/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk index 7282c3f16f76..be8b449b3598 100644 --- a/javaunohelper/source/makefile.mk +++ b/javaunohelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2000-11-13 15:46:07 $ +# last change: $Author: svesik $ $Date: 2001-02-02 19:38:15 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -105,10 +105,8 @@ UNOTYPES= \ SLOFILES= \ $(SLO)$/javaunohelper.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)$/staticmb.obj .ENDIF |