diff options
| author | Babak Mahbod <babak.mahbod@openoffice.org> | 2000-09-23 07:04:53 +0000 |
|---|---|---|
| committer | Babak Mahbod <babak.mahbod@openoffice.org> | 2000-09-23 07:04:53 +0000 |
| commit | 971030c30c1c001ca176d649fe24b4e189881e1f (patch) | |
| tree | c79294021375835921cbd6d48000ba7bacdc005c /configmgr | |
| parent | 22d13db3e24df77a5540e4880d3ea7e1fba7e31e (diff) | |
Required for MacOS X C++ compiler.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/registry/makefile.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/configmgr/source/registry/makefile.mk b/configmgr/source/registry/makefile.mk index 70653bc4fe59..aa261aeaddbd 100644 --- a/configmgr/source/registry/makefile.mk +++ b/configmgr/source/registry/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:13:42 $ +# last change: $Author: babak.mahbod $ $Date: 2000-09-23 08:04:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,9 +72,18 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/configregistry.obj \ - $(SLO)$/cfgregistrykey.obj \ +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 +# symbols, but we can't ignore multiple defined symbols. + +.IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" +SLOFILES+=$(SLO)$/staticmb.obj +.ENDIF # --- Targets ---------------------------------- |