diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
| commit | b248734d34c4f38493e90820efb54e3ac75979c4 (patch) | |
| tree | 3c0d897dcbdb072ccb271dd217e176d1ddd95df8 /cppu/source/uno/makefile.mk | |
| parent | 7cbda3973ca6444caaa84e26fa60785d76f4e90f (diff) | |
Updated to SRC614
Diffstat (limited to 'cppu/source/uno/makefile.mk')
| -rw-r--r-- | cppu/source/uno/makefile.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cppu/source/uno/makefile.mk b/cppu/source/uno/makefile.mk index a11b841fd..16acb5c67 100644 --- a/cppu/source/uno/makefile.mk +++ b/cppu/source/uno/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:25:52 $ +# last change: $Author: pluby $ $Date: 2000-12-14 07:33:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,13 +80,6 @@ SLOFILES= \ $(SLO)$/lbmap.obj \ $(SLO)$/lbenv.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 ------------------------------------------------------ .INCLUDE : ..$/..$/util$/target.pmk |