diff options
| author | Babak Mahbod <bmahbod@openoffice.org> | 2000-10-09 20:59:31 +0000 |
|---|---|---|
| committer | Babak Mahbod <bmahbod@openoffice.org> | 2000-10-09 20:59:31 +0000 |
| commit | 3759cff7cb42b82c445bd3cdad37bd84e4db9c8e (patch) | |
| tree | c4ca87bdf9794719765fe1a714a8b5b49aa0a004 /ucbhelper | |
| parent | ce5594dd56224a11a99eabed16b0f324b9db6894 (diff) | |
Updated for MacOS X strict ANSI C++ compiler.
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/client/makefile.mk | 13 | ||||
| -rw-r--r-- | ucbhelper/source/provider/makefile.mk | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ucbhelper/source/client/makefile.mk b/ucbhelper/source/client/makefile.mk index 2b2079e1c44c..5963004ff1ad 100644 --- a/ucbhelper/source/client/makefile.mk +++ b/ucbhelper/source/client/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 17:03:37 $ +# last change: $Author: bmahbod $ $Date: 2000-10-09 21:59:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -85,6 +85,15 @@ SLOFILES=\ .ENDIF +# 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)$/staticmbclient.obj +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk index 0631285faca1..e8d201b48fb5 100644 --- a/ucbhelper/source/provider/makefile.mk +++ b/ucbhelper/source/provider/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: bmahbod $ $Date: 2000-10-06 01:37:27 $ +# last change: $Author: bmahbod $ $Date: 2000-10-09 21:59:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -98,7 +98,7 @@ SLOFILES=\ # symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="NETBSD" || "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" -SLOFILES+=$(SLO)$/staticmb.obj +SLOFILES+=$(SLO)$/staticmbprovider.obj .ENDIF # --- Targets ------------------------------------------------------ |