diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 13:18:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 13:18:53 +0000 |
| commit | c74b1a7e604877846b0504dc133a61ad829f2133 (patch) | |
| tree | eeb9267d8866c8de752d16838d486a4ad159bb2c /basctl | |
| parent | fef5d334301a812626bb87e497136235333e9c59 (diff) | |
INTEGRATION: CWS tune01 (1.14.4.1.24); FILE MERGED
2003/04/11 13:43:11 mhu 1.14.4.1.24.4: #108383# Re-added UNOTOOLSLIB dependency.
2003/04/08 09:06:30 mhu 1.14.4.1.24.3: RESYNC: (1.14.4.1-1.16); FILE MERGED
2003/04/01 12:41:26 mhu 1.14.4.1.24.2: #108383# Removed excess shared library dependencies.
2003/03/31 11:20:16 kso 1.14.4.1.24.1: #i12685# - Added map file.
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/util/makefile.mk | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 7220debc9f19..2311ad7dd447 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: vg $ $Date: 2003-03-26 12:52:18 $ +# last change: $Author: vg $ $Date: 2003-04-15 14:18:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,7 +67,6 @@ TARGET=basctl #svx.hid generieren GEN_HID=TRUE GEN_HID_OTHER=TRUE -USE_LDUMP2=TRUE # --- Settings ----------------------------------------------------- @@ -86,40 +85,33 @@ SHL1IMPLIB= basctl SHL1BASE = 0x1d800000 SHL1STDLIBS= \ $(SVXLIB) \ - $(SALLIB) \ - $(TOOLSLIB) \ + $(SFX2LIB) \ + $(BASICLIB) \ + $(SO2LIB) \ $(SVTOOLLIB) \ - $(SVLLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ + $(TKLIB) \ $(VCLLIB) \ - $(SO2LIB) \ + $(SVLLIB) \ $(SOTLIB) \ - $(SFX2LIB) \ - $(BASICLIB) \ - $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ - $(TKLIB) \ - $(XMLSCRIPTLIB) - + $(TOOLSLIB) \ + $(XMLSCRIPTLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) .IF "$(GUI)"=="WNT" -SHL1STDLIBS+=\ - $(SHELLLIB) -.ENDIF - -.IF "$(SOLAR_JAVA)" != "" -SHL1STDLIBS+=\ - $(SJLIB) -.ENDIF +SHL1STDLIBS+= $(SHELLLIB) +.ENDIF # WNT SHL1LIBS= $(SLB)$/basctl.lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def +SHL1VERSIONMAP=basctl.map + DEF1NAME =$(SHL1TARGET) -DEF1DES = Rtf, Edt, Outliner, SvDraw, Form, Fmcomp, Engine3D, MSFilter -DEF1EXPORTFILE = basctl.dxp LIB1TARGET =$(SLB)$/basctl.lib LIB1FILES = \ @@ -130,7 +122,7 @@ LIB1FILES = \ SRSFILELIST=\ $(SRS)$/basicide.srs \ $(SRS)$/dlged.srs - + SRSFILELIST+= $(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT)$/sfx.srs RESLIB1NAME=basctl @@ -140,7 +132,5 @@ RESLIB1SRSFILES= $(SRSFILELIST) .INCLUDE : target.mk - - -.ENDIF # "$(header)" == "" +.ENDIF # "$(header)" == "" |