[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sw/Library_msword.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk

[Bjoern Michaelsen]

 sw/Library_msword.mk   |    1 -
 sw/Library_sw.mk       |    3 +--
 sw/Library_swui.mk     |    1 -
 sw/Library_vbaswobj.mk |    1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ae9f68d1e73a973046deee6fd602a2a4c3eba2a3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Mar 17 13:38:39 2011 +0100

    killing off stl in gbuild

diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 507802e..a05b693 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     oox \
     sfx \
     sot \
-    stl \
     svl \
     svt \
     svx \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 4168c5f..6bcc9da 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_set_include,sw,\
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     -I$(WORKDIR)/Misc/sw/ \
     $$(INCLUDE) \
-    $(if $(filter YES,$(SYSTEM_LIBXML),$(LIBXML_CFLAGS)) \
+    $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
     -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
@@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     sb \
     sfx \
     sot \
-    stl \
     svl \
     svt \
     svx \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 9991435..1023394 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
     sal \
     sfx \
     sot \
-    stl \
     svl \
     svt \
     svx \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index f5cd44d..eccaa8e 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
     sal \
     sb \
     sfx \
-    stl \
     svl \
     svt \
     svx \