diff options
| author | npower Developer <npower@openoffice.org> | 2010-02-26 13:24:33 +0000 |
|---|---|---|
| committer | npower Developer <npower@openoffice.org> | 2010-02-26 13:24:33 +0000 |
| commit | 26801698a4aa2e5bf20a0fc4c397597891657eed (patch) | |
| tree | b9c0982d4c5709c7fee4c89624b047725f3194db /sw/util | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
npower14miscfixes: #i108853# fix build break
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index c69cec312565..a8e2031bc8d0 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -118,8 +118,12 @@ SHL1STDLIBS+= \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) \ - $(I18NUTILLIB) \ - $(VBAHELPERLIB) \ + $(I18NUTILLIB) +.IF "$(ENABLE_VBA)" == "YES" +SHL1STDLIBS+= \ + $(VBAHELPERLIB) +.ENDIF # "$(ENABLE_VBA)" == "YES" +SHL1STDLIBS+= \ $(AVMEDIALIB) .IF "$(GUI)"=="WNT" @@ -337,6 +341,7 @@ SHL4STDLIBS= \ $(BASICLIB) \ $(I18NUTILLIB) +.IF "$(ENABLE_VBA)" == "YES" #target vba TARGET_VBA=vbaswobj SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno @@ -370,5 +375,6 @@ SHL5STDLIBS= \ SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib +.ENDIF # .IF "$(ENABLE_VBA)" == "YES" .INCLUDE : target.mk |