From 712470d3ce9ef2e628eec5c34658a5ceea1a1e99 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Sat, 31 Oct 2009 00:29:04 +0100
Subject: #i106421#: move msfilter to filter

---
 svx/util/makefile.mk | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'svx/util')

diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 3dcf5ca250..67b8e9f3b3 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -99,7 +99,6 @@ LIB5FILES=\
     $(SLB)$/form-core.lib \
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
-    $(SLB)$/msfilter-core.lib \
     $(SLB)$/options-core.lib
 
 LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
@@ -112,6 +111,7 @@ LIB6FILES=\
     $(SLB)$/svdraw-core.lib \
     $(SLB)$/svxlink.lib \
     $(SLB)$/svxrtf-core.lib    \
+    $(SLB)$/svxrtf.lib
     $(SLB)$/table-core.lib \
     $(SLB)$/tbxctrls-core.lib  \
     $(SLB)$/toolbars.lib \
@@ -120,13 +120,6 @@ LIB6FILES=\
     $(SLB)$/xml.lib \
     $(SLB)$/xout.lib
 
-# Objects needed for the svxmsfilter library.
-LIB7TARGET= $(SLB)$/$(TARGET)_7.lib
-LIB7FILES=\
-    $(SLB)$/msfilter-msfilter.lib \
-    $(SLB)$/svdraw-msfilter.lib \
-    $(SLB)$/svxrtf.lib
-
 HELPIDFILES=    ..$/inc$/helpid.hrc
 
 # svxcore
@@ -251,37 +244,6 @@ SHL3STDLIBS+= \
              $(ADVAPI32LIB)
 .ENDIF # WNT
 
-# svxmsfilter library
-SHL4TARGET= svxmsfilter$(DLLPOSTFIX)
-SHL4IMPLIB= isvxmsfilter
-SHL4USE_EXPORTS=name
-SHL4DEPN=$(SHL1TARGETN)
-SHL4LIBS= $(LIB7TARGET)
-
-SHL4STDLIBS= \
-             $(SVXCORELIB) \
-             $(SFX2LIB) \
-             $(XMLOFFLIB) \
-             $(GOODIESLIB) \
-             $(BASEGFXLIB) \
-             $(BASICLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(XMLSCRIPTLIB) \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(SALLIB)
-
-SHL4DEF=	$(MISC)$/$(SHL4TARGET).def
-DEF4NAME=	$(SHL4TARGET)
-DEFLIB4NAME=$(TARGET)_7
-
 # ------------------------------------------------------------------------------
 
 # Resource files
-- 
cgit v1.2.3