diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:55:11 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:55:11 +0000 |
| commit | 3340f6a8e500ce3a9cc21337dc61c52a63bef7d1 (patch) | |
| tree | 78974919c1f427b2db0449f118b40b53fd879dc4 /svtools/util | |
| parent | 00a4d6b59ba8fcc7acf9c0adb796beddee7afe40 (diff) | |
INTEGRATION: CWS geordi2q01 (1.44.122); FILE MERGED
2003/08/18 13:32:15 hr 1.44.122.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'svtools/util')
| -rw-r--r-- | svtools/util/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 298e6183b2f3..595cf62491b6 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -2,9 +2,9 @@ #* #* $RCSfile: makefile.mk,v $ #* -#* $Revision: 1.44 $ +#* $Revision: 1.45 $ #* -#* last change: $Author: vg $ $Date: 2003-04-15 13:41:33 $ +#* last change: $Author: hjs $ $Date: 2003-08-18 14:55:11 $ #* #* The Contents of this file are made available subject to the terms of #* either of the following licenses @@ -177,8 +177,10 @@ RESLIB2SRSFILES=\ SHL1TARGET= svt$(VERSION)$(DLLPOSTFIX) SHL1IMPLIB= _svt +.IF "$(OS)"!="MACOSX" # static libraries SHL1STDLIBS+= $(JPEG3RDLIB) +.ENDIF # dynamic libraries SHL1STDLIBS+= \ @@ -196,6 +198,11 @@ SHL1STDLIBS+= \ $(SALLIB) \ $(ICUUCLIB) +.IF "$(OS)"=="MACOSX" +# static libraries go at end +SHL1STDLIBS+= $(JPEG3RDLIB) +.ENDIF + .IF "$(GUI)"=="WNT" SHL1STDLIBS+= \ uwinapi.lib \ |