[ooo-build-commit] Branch 'ooo/master' - svx/util

[Jan Holesovsky]

 svx/util/makefile.mk |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 1e502bed77b503b4ebe4b08c569daa152bcf7bea
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Sep 2 14:41:36 2009 +0000

    #i100000# workaround for MS linker: splitted lib

diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 5e0c43e..8986292 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -100,7 +100,10 @@ LIB5FILES=\
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
     $(SLB)$/msfilter-core.lib \
-    $(SLB)$/options-core.lib   \
+    $(SLB)$/options-core.lib
+
+LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
+LIB6FILES=\
     $(SLB)$/outliner.lib \
     $(SLB)$/overlay.lib \
     $(SLB)$/primitive2d.lib \
@@ -118,8 +121,8 @@ LIB5FILES=\
     $(SLB)$/xout.lib
 
 # Objects needed for the svxmsfilter library.
-LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
-LIB6FILES=\
+LIB7TARGET= $(SLB)$/$(TARGET)_7.lib
+LIB7FILES=\
     $(SLB)$/msfilter-msfilter.lib \
     $(SLB)$/svdraw-msfilter.lib \
     $(SLB)$/svxrtf.lib
@@ -130,7 +133,7 @@ HELPIDFILES=    ..$/inc$/helpid.hrc
 SHL1TARGET= svxcore$(DLLPOSTFIX)
 SHL1IMPLIB= isvxcore
 SHL1USE_EXPORTS=name
-SHL1LIBS= $(LIB5TARGET)
+SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET)
 
 SHL1STDLIBS= \
              $(AVMEDIALIB) \
@@ -253,7 +256,7 @@ SHL4TARGET= svxmsfilter$(DLLPOSTFIX)
 SHL4IMPLIB= isvxmsfilter
 SHL4USE_EXPORTS=name
 SHL4DEPN=$(SHL1TARGETN)
-SHL4LIBS= $(LIB6TARGET)
+SHL4LIBS= $(LIB7TARGET)
 
 SHL4STDLIBS= \
              $(SVXCORELIB) \