diff options
| author | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:45:06 +0000 |
|---|---|---|
| committer | Gene Anaya <ganaya@openoffice.org> | 2000-10-10 04:45:06 +0000 |
| commit | 4e7553d68e4940d90b0ca24e2a3ae6bdfd1974eb (patch) | |
| tree | f9030ec0a058ac0ba8a92bdbff85aba560793e51 /stoc/source/servicemanager | |
| parent | 54e86e78a9564e5c57c95a513cc38838ebc58d1f (diff) | |
add staticmbsedrvicemanager.cxx for macosx
Diffstat (limited to 'stoc/source/servicemanager')
| -rw-r--r-- | stoc/source/servicemanager/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk index fe8980004a31..a736117bd79c 100644 --- a/stoc/source/servicemanager/makefile.mk +++ b/stoc/source/servicemanager/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 15:29:35 $ +# last change: $Author: ganaya $ $Date: 2000-10-10 05:45:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -85,6 +85,12 @@ UNOTYPES=$($(TARGET)_XML2CMPTYPES) SLOFILES= \ $(SLO)$/servicemanager.obj \ $(SLO)$/$(COMP1TYPELIST)_description.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)$/staticmbservicemanager.obj +.ENDIF SHL1TARGET= $(TARGET) |