diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-02 13:42:37 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-02 13:42:37 +0000 |
| commit | 2a24f1f5bf0df03ee6400a83b5ec94f1d2b3e497 (patch) | |
| tree | b40ef5dd337cfb77724e2d656b9d665d28bfd9dc /ucb/source | |
| parent | 1a513a3acf969f4c0ef2e65b8632e2a3523302b7 (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/file/makefile.mk | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/makefile.mk | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/makefile.mk | 9 |
3 files changed, 9 insertions, 16 deletions
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index ef440168db3b..30c4309dbc73 100644 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hro $ $Date: 2000-11-17 10:42:04 $ +# last change: $Author: svesik $ $Date: 2001-02-02 14:42:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,10 +84,8 @@ SLOFILES=\ $(SLO)$/filnot.obj \ $(SLO)$/filprp.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)$/staticmbfile.obj .ENDIF diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk index c68f9b17e104..5edca8724a80 100644 --- a/ucb/source/ucp/hierarchy/makefile.mk +++ b/ucb/source/ucp/hierarchy/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: kso $ $Date: 2000-10-16 14:54:18 $ +# last change: $Author: svesik $ $Date: 2001-02-02 14:42:36 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -88,10 +88,8 @@ SLOFILES=\ $(SLO)$/hierarchyurlcode.obj \ $(SLO)$/dynamicresultset.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)$/staticmbhierarchy.obj .ENDIF diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index ccacf066a9e8..4fce041a23b0 100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kso $ $Date: 2001-01-26 16:02:40 $ +# last change: $Author: svesik $ $Date: 2001-02-02 14:42:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -109,11 +109,8 @@ SLOFILES=\ $(SLO)$/DateTimeHelper.obj \ $(SLO)$/proxyconfig.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)$/staticmbwebdav.obj .ENDIF |