diff options
Diffstat (limited to 'sw/util/makefile.mk')
| -rw-r--r-- | sw/util/makefile.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 3018f0ad2835..e2d7fb838643 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -118,7 +118,6 @@ SHL1STDLIBS+= \ $(SALHELPERLIB) \ $(ICUUCLIB) \ $(I18NUTILLIB) \ - $(VBAHELPERLIB) \ $(AVMEDIALIB) .IF "$(GUI)"=="WNT" @@ -133,7 +132,7 @@ DEFLIB1NAME=swall $(SWLIBFILES:b) SHL2TARGET= swd$(DLLPOSTFIX) SHL2IMPLIB= swdimp -SHL2VERSIONMAP= swd.map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) @@ -336,12 +335,13 @@ SHL4STDLIBS= \ $(BASICLIB) \ $(I18NUTILLIB) +.IF "$(ENABLE_VBA)" == "YES" #target vba TARGET_VBA=vbaswobj -SHL5TARGET=$(TARGET_VBA).uno +SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno SHL5IMPLIB= i$(TARGET_VBA) -SHL5DLLPRE= -SHL5VERSIONMAP=$(TARGET_VBA).map + +SHL5VERSIONMAP=$(SOLARENV)/src/component.map SHL5DEF=$(MISC)$/$(SHL5TARGET).def DEF5NAME=$(SHL5TARGET) SHL5STDLIBS= \ @@ -369,5 +369,6 @@ SHL5STDLIBS= \ SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib +.ENDIF # .IF "$(ENABLE_VBA)" == "YES" .INCLUDE : target.mk |