diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:27:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:27:59 +0000 |
| commit | 1b58247f884396ea488a8f2c197696dce902df16 (patch) | |
| tree | b48b6f4b449e9bcc910839497d4771e798c5d7c5 /sw/util/makefile.mk | |
| parent | 26e42c53b0c6898e3b0682e8078891890dde9e55 (diff) | |
INTEGRATION: CWS pchfix04 (1.58.2); FILE MERGED
2007/04/25 23:11:04 hjs 1.58.2.2: RESYNC: (1.58-1.59); FILE MERGED
2007/02/02 15:26:59 hjs 1.58.2.1: #i72289# split .lib files
Diffstat (limited to 'sw/util/makefile.mk')
| -rw-r--r-- | sw/util/makefile.mk | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index c13f576b77..d583df29cb 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.59 $ +# $Revision: 1.60 $ # -# last change: $Author: vg $ $Date: 2007-03-26 13:26:31 $ +# last change: $Author: kz $ $Date: 2007-05-10 16:27:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -83,23 +83,25 @@ RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res RESLIB1SRSFILES= \ $(sw_res_files) +SWLIBFILES = \ + $(SLB)$/core1.lib \ + $(SLB)$/core2.lib \ + $(SLB)$/core3.lib \ + $(SLB)$/core4.lib \ + $(SLB)$/filter.lib \ + $(SLB)$/ui1.lib \ + $(SLB)$/ui2.lib + SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX) SHL1USE_EXPORTS=ordinal SHL1IMPLIB= _$(TARGET) -SHL1LIBS= $(SLB)$/swall.lib +SHL1LIBS= $(SLB)$/swall.lib $(SWLIBFILES) LIB1TARGET =$(SLB)$/swall.lib LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ $(OUT)$/slo$/swdll.obj -LIB1FILES = \ - $(SLB)$/core1.lib \ - $(SLB)$/core2.lib \ - $(SLB)$/filter.lib \ - $(SLB)$/ui1.lib \ - $(SLB)$/ui2.lib - .IF "$(OS)"!="MACOSX" # static libraries SHL1STDLIBS+= $(SCHLIB) @@ -146,7 +148,7 @@ SHL1STDLIBS+= $(ADVAPI32LIB) SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1BASE= 0x1e000000 DEF1NAME =$(SHL1TARGET) -DEFLIB1NAME=swall +DEFLIB1NAME=swall $(SWLIBFILES:b) SHL2TARGET= swd$(UPD)$(DLLPOSTFIX) SHL2IMPLIB= swdimp |