diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 12:11:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 12:11:33 +0000 |
| commit | c269bfa58b04d576b47b4d51c7f653809f0700d9 (patch) | |
| tree | 000ecb9ecbb4dee3075ff64fb04377da1b9c139f /svtools/util | |
| parent | 22cf9a53d2cf272b34fe29e2571dae187254426c (diff) | |
INTEGRATION: CWS jl22 (1.52.76); FILE MERGED
2005/06/28 09:39:34 jl 1.52.76.4: #i37020 patch resource
2005/06/20 12:18:24 jl 1.52.76.3: #i37020# patch resource not needed any more, undoing recent changes
2005/06/20 10:58:38 jl 1.52.76.2: #i37020# using patch resource manager for javainteraction handler
2005/06/16 15:03:53 jl 1.52.76.1: #i37020 new svtools/source/java contains javainteractionhandler
Diffstat (limited to 'svtools/util')
| -rw-r--r-- | svtools/util/makefile.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 174f6111d81f..1fb536e7361f 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -2,9 +2,9 @@ #* #* $RCSfile: makefile.mk,v $ #* -#* $Revision: 1.52 $ +#* $Revision: 1.53 $ #* -#* last change: $Author: obo $ $Date: 2005-04-13 11:55:13 $ +#* last change: $Author: obo $ $Date: 2005-07-07 13:11:33 $ #* #* The Contents of this file are made available subject to the terms of #* either of the following licenses @@ -64,6 +64,7 @@ PRJ=.. PRJNAME=svtools TARGET=svtool RESTARGET=svt +RESTARGETPATCH=svp RESTARGETSIMPLE=svs VERSION=$(UPD) GEN_HID=TRUE @@ -114,7 +115,8 @@ LIB7FILES= \ $(SLB)$/svdde.lib \ $(SLB)$/svhtml.lib \ $(SLB)$/svrtf.lib \ - $(SLB)$/heavyconfig.lib + $(SLB)$/heavyconfig.lib \ + $(SLB)$/java.lib .IF "$(GUI)" == "UNX" LIB7FILES+= $(SLB)$/eaimp.lib @@ -144,13 +146,19 @@ RESLIB1SRSFILES= \ $(SRS)$/svcontnr.srs \ $(SRS)$/uno.srs \ $(SRS)$/browse.srs \ - $(SRS)$/accessibility.srs + $(SRS)$/accessibility.srs \ + $(SRS)$/javaerror.srs RESLIB2NAME= $(RESTARGETSIMPLE) RESLIB2SRSFILES=\ $(SRS)$/items1.srs \ $(SRS)$/misc1.srs + +RESLIB3NAME= $(RESTARGETPATCH) +RESLIB3SRSFILES= \ + $(SRS)$/patchjavaerror.srs + # build the shared library -------------------------------------------------- SHL1TARGET= svt$(VERSION)$(DLLPOSTFIX) @@ -176,7 +184,8 @@ SHL1STDLIBS+= \ $(CPPULIB) \ $(VOSLIB) \ $(SALLIB) \ - $(ICUUCLIB) + $(ICUUCLIB) \ + $(JVMFWKLIB) .IF "$(OS)"=="MACOSX" # static libraries go at end |