diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
| commit | c6cfddced2a774dd34d0cf265ed0fcb4baeb19d7 (patch) | |
| tree | fd4fddc6f38e9de412c95391a7f3eeb6616b553c /sw/util | |
| parent | a8f8b4275e3a0d7c16293bad74351d7890046f70 (diff) | |
| parent | 5c62576e5d8af7379a57b45392d3c51c0bcd0fcc (diff) | |
CWS gnumake2: resync to DEV300_m84
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/makefile.mk | 11 | ||||
| -rwxr-xr-x | sw/util/msword.map | 2 | ||||
| -rw-r--r-- | sw/util/sw.map | 8 | ||||
| -rw-r--r-- | sw/util/swd.map | 8 | ||||
| -rw-r--r-- | sw/util/swui.map | 2 | ||||
| -rw-r--r-- | sw/util/vbaswobj.map | 9 |
6 files changed, 8 insertions, 32 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 diff --git a/sw/util/msword.map b/sw/util/msword.map index db60fc5ce8c8..16b9d25b0b78 100755 --- a/sw/util/msword.map +++ b/sw/util/msword.map @@ -1,4 +1,4 @@ -MSWORD_1_0 { +UDK_3_0_0 { global: ImportRTF; ExportRTF; diff --git a/sw/util/sw.map b/sw/util/sw.map deleted file mode 100644 index 272fab31a03d..000000000000 --- a/sw/util/sw.map +++ /dev/null @@ -1,8 +0,0 @@ -SW_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sw/util/swd.map b/sw/util/swd.map deleted file mode 100644 index 272fab31a03d..000000000000 --- a/sw/util/swd.map +++ /dev/null @@ -1,8 +0,0 @@ -SW_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sw/util/swui.map b/sw/util/swui.map index f40bd255fe1d..ad5e33836c7c 100644 --- a/sw/util/swui.map +++ b/sw/util/swui.map @@ -1,4 +1,4 @@ -SWUI_1_0 { +UDK_3_0_0 { global: CreateDialogFactory; local: diff --git a/sw/util/vbaswobj.map b/sw/util/vbaswobj.map deleted file mode 100644 index 737cddbfe3df..000000000000 --- a/sw/util/vbaswobj.map +++ /dev/null @@ -1,9 +0,0 @@ -OOO_1.1 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; |