diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:17:53 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:17:53 +0000 |
| commit | 1f9001ab7963154c62307ac5e05d400eb9a2791a (patch) | |
| tree | 431f69609acd3ed45df3fd363ac50cee4168e2ba /tools | |
| parent | 602e81a49da0c6697ed4e85dcfb47e483fb15aad (diff) | |
INTEGRATION: CWS geordi2q01 (1.11.24); FILE MERGED
2003/08/18 13:36:13 hr 1.11.24.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/util/makefile.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 7839e955cff4..ed897dff3aea 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: hr $ $Date: 2003-07-16 17:15:49 $ +# last change: $Author: hjs $ $Date: 2003-08-18 15:17:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -166,9 +166,15 @@ LIB1FILES+= \ $(SLB)$/zcodec.lib \ $(SLB)$/inet.lib +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += $(UCBHELPERLIB) \ + $(CPPULIB) \ + $(ZLIB3RDLIB) +.ELSE SHL1STDLIBS += $(ZLIB3RDLIB) \ - $(UCBHELPERLIB) \ - $(CPPULIB) + $(UCBHELPERLIB) \ + $(CPPULIB) +.ENDIF LIB1FILES+= $(SLB)$/dll.lib |