diff options
| author | Babak Mahbod <bmahbod@openoffice.org> | 2000-10-06 22:53:16 +0000 |
|---|---|---|
| committer | Babak Mahbod <bmahbod@openoffice.org> | 2000-10-06 22:53:16 +0000 |
| commit | a522f25e656944d4474d05f23d9eeeee6adebd83 (patch) | |
| tree | 279dc142ae944f1d72497a2c3d6e6d5cfbaeb9ce /unotools/util | |
| parent | a9ac5f8eaf70158afbef4299362b5f7a38e118fb (diff) | |
Updated for use with MacOS X strict ANSI C++ compiler.
Diffstat (limited to 'unotools/util')
| -rw-r--r-- | unotools/util/makefile.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/unotools/util/makefile.mk b/unotools/util/makefile.mk index b1e9e66f2859..c927dbc6d127 100644 --- a/unotools/util/makefile.mk +++ b/unotools/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: fs $ $Date: 2000-10-06 14:37:25 $ +# last change: $Author: bmahbod $ $Date: 2000-10-06 23:53:16 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,13 +89,6 @@ LIB1FILES=\ $(SLB)$/ucbhelp.lib \ $(SLB)$/procfact.lib -# 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" -LIB1OBJFILES+=$(OBJ)$/staticmb.obj -.ENDIF - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) SHL1IMPLIB=iutl |