diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 17:27:25 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 17:27:25 +0000 |
| commit | d938ba1d67c3106e60b7ce4768ba2cfd10418433 (patch) | |
| tree | 3ea8eef7b4562767a704a12e12a7cf78d84d32a1 /toolkit | |
| parent | 51343e9b81c6b434eed0207dd80d113b9fe821a7 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/makefile.mk | 8 | ||||
| -rw-r--r-- | toolkit/source/controls/makefile.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk index 9aae8d01d07b..fe63e189639d 100644 --- a/toolkit/source/awt/makefile.mk +++ b/toolkit/source/awt/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: pluby $ $Date: 2000-10-08 02:48:40 $ +# last change: $Author: svesik $ $Date: 2001-02-02 18:21:41 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -91,10 +91,8 @@ SLOFILES= \ $(SLO)$/vclxwindow.obj \ $(SLO)$/vclxwindows.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)$/staticmbawt.obj .ENDIF diff --git a/toolkit/source/controls/makefile.mk b/toolkit/source/controls/makefile.mk index 406133bf02bc..5aa644def1c9 100644 --- a/toolkit/source/controls/makefile.mk +++ b/toolkit/source/controls/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: mt $ $Date: 2001-01-24 14:56:35 $ +# last change: $Author: svesik $ $Date: 2001-02-02 18:23:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,10 +86,8 @@ SLOFILES= \ $(SLO)$/unocontrolmodel.obj \ $(SLO)$/unocontrols.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)$/staticmbcontrols.obj .ENDIF |