diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-11 11:26:34 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-11 11:26:34 +0200 |
| commit | 4cdff703d2fbf18ee0ef3bbfef2d22ce6ada014d (patch) | |
| tree | 14bbe81f52ac1aa3d63c7aa955e23fa9f2d99a1b /sw/util | |
| parent | fd0d8d24cb28698f12699239e654649f52592c78 (diff) | |
| parent | ca466ff4b9b353a136444317d7f0d98f21fc7b2e (diff) | |
CWS-TOOLING: integrate CWS npower14miscfixes
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 8f74c982486f..2907264d89cf 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -118,8 +118,8 @@ SHL1STDLIBS+= \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) \ - $(I18NUTILLIB) \ - $(VBAHELPERLIB) \ + $(I18NUTILLIB) +SHL1STDLIBS+= \ $(AVMEDIALIB) .IF "$(GUI)"=="WNT" @@ -337,6 +337,7 @@ SHL4STDLIBS= \ $(BASICLIB) \ $(I18NUTILLIB) +.IF "$(ENABLE_VBA)" == "YES" #target vba TARGET_VBA=vbaswobj SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno @@ -370,5 +371,6 @@ SHL5STDLIBS= \ SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib +.ENDIF # .IF "$(ENABLE_VBA)" == "YES" .INCLUDE : target.mk |