diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-04-28 17:52:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-04-28 17:52:28 +0200 |
| commit | 8424f481e07b356236e1f941a3c4d426ebccefda (patch) | |
| tree | 71d894e2d7cdf1a96edfe6d5e654c5030e044a9c /unoxml | |
| parent | 7e619ffe397e2b607b31488cd70836a0d600c5cc (diff) | |
| parent | 17e7675fe6fccf5a0f084bb9f7bceb4f663f8e3b (diff) | |
merge DEV300_m77
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/rdf/makefile.mk | 2 | ||||
| -rw-r--r-- | unoxml/source/service/exports.map | 10 | ||||
| -rw-r--r-- | unoxml/source/service/makefile.mk | 2 | ||||
| -rw-r--r-- | unoxml/test/export.map | 2 | ||||
| -rw-r--r-- | unoxml/test/makefile.mk | 2 |
5 files changed, 5 insertions, 13 deletions
diff --git a/unoxml/source/rdf/makefile.mk b/unoxml/source/rdf/makefile.mk index 39741bda15b1..1fd36f45ce0b 100644 --- a/unoxml/source/rdf/makefile.mk +++ b/unoxml/source/rdf/makefile.mk @@ -58,7 +58,7 @@ SHL1OBJS= $(SLOFILES) SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) -SHL1VERSIONMAP=../service/exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/unoxml/source/service/exports.map b/unoxml/source/service/exports.map deleted file mode 100644 index ba501f9ae076..000000000000 --- a/unoxml/source/service/exports.map +++ /dev/null @@ -1,10 +0,0 @@ -UDK_3_0_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; diff --git a/unoxml/source/service/makefile.mk b/unoxml/source/service/makefile.mk index bbce7e913f09..93aec0746323 100644 --- a/unoxml/source/service/makefile.mk +++ b/unoxml/source/service/makefile.mk @@ -53,7 +53,7 @@ SHL1OBJS= $(SLOFILES) SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/unoxml/test/export.map b/unoxml/test/export.map index 709047ae63e5..7321bbca16ad 100644 --- a/unoxml/test/export.map +++ b/unoxml/test/export.map @@ -25,7 +25,7 @@ # #************************************************************************* -UDK_3.1 { +UDK_3_0_0 { global: registerAllTestFunction; diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk index 8fcba9ff328a..11fe8884befd 100644 --- a/unoxml/test/makefile.mk +++ b/unoxml/test/makefile.mk @@ -37,6 +37,8 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +CFLAGSCXX += $(CPPUNIT_CFLAGS) + # --- Common ---------------------------------------------------------- # BEGIN ---------------------------------------------------------------- |