diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:34:02 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 16:34:02 +0000 |
| commit | 0572447afd05acff7fc2efac7476164fee58f5db (patch) | |
| tree | 2d40305b470eef42a43055e7be648b8aab11ca0a /cpputools/source | |
| parent | 9fd645a71408542af2a97a7f8fdaa30ba9c198e7 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'cpputools/source')
| -rw-r--r-- | cpputools/source/unoexe/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk index 095a191d7..2310a5612 100644 --- a/cpputools/source/unoexe/makefile.mk +++ b/cpputools/source/unoexe/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2000-11-13 15:43:24 $ +# last change: $Author: svesik $ $Date: 2001-02-02 17:34:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -107,10 +107,8 @@ CXXFILES= \ APP1TARGET=$(TARGET) APP1OBJS=$(OBJ)$/unoexe.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" APP1OBJS+=$(OBJ)$/staticmb.obj .ENDIF |