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 | aae96eba981365488ece3019a1d014a29ba46e57 (patch) | |
| tree | a86ffc0be2e6dfe66366cf742146ba037e4e6251 /sax | |
| parent | 469c8ef9ea0ceaa5062def7ef0f2e1b1c1ed9dd6 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/expatwrap/makefile.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk index 19119165b1a1..8babee9e94ea 100644 --- a/sax/source/expatwrap/makefile.mk +++ b/sax/source/expatwrap/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ +# last change: $Author: svesik $ $Date: 2001-02-02 19:09:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -78,10 +78,8 @@ SLOFILES =\ $(SLO)$/sax_expat.obj \ $(SLO)$/saxwriter.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 |