diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 16:33:54 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2001-01-16 16:33:54 +0000 |
commit | a78dd8242ac77a7b7eaf97b2f6a3f047075aa67e (patch) | |
tree | 06b655d70488079597acf5f38cb9e76a23b905a9 /svtools | |
parent | cc37fbb3433608ce57e1bc3cba7c446c37e3863c (diff) |
too much is as bad as none
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/misc/makefile.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk index 0bfdd0abaf80..80aa6837b21c 100644 --- a/svtools/source/misc/makefile.mk +++ b/svtools/source/misc/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2001-01-12 11:27:58 $ +# last change: $Author: hjs $ $Date: 2001-01-16 17:33:54 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -141,14 +141,6 @@ EXCEPTIONSFILES=\ $(SLO)$/strmadpt.obj \ $(SLO)$/iniman.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" -LIB1OBJFILES+=$(SLO)$/staticmbmisc.obj -LIB2OBJFILES+=$(SLO)$/staticmbmisc.obj -.ENDIF - UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb UNOUCROUT=$(OUT)$/inc |