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 | ee19b0e2599cbaf3f1550267df3bd0208c9b66f7 (patch) | |
| tree | 362f08476cae3cfa81b2e50141adf6597fc5f924 /configmgr | |
| parent | 474ef21b7b043adc2efe3fd87b4fb0667b0e373d (diff) | |
Merge NetBSD changes by Michael Rauch from OO614B to HEAD.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/registry/makefile.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configmgr/source/registry/makefile.mk b/configmgr/source/registry/makefile.mk index aa261aeaddbd..7bc6e9d2e9db 100644 --- a/configmgr/source/registry/makefile.mk +++ b/configmgr/source/registry/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: babak.mahbod $ $Date: 2000-09-23 08:04:53 $ +# last change: $Author: svesik $ $Date: 2001-02-02 18:16:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -76,12 +76,10 @@ SLOFILES=\ $(SLO)$/configregistry.obj \ $(SLO)$/cfgregistrykey.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 +# 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 |