summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-17 13:38:39 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-03-17 13:38:39 +0100
commitae9f68d1e73a973046deee6fd602a2a4c3eba2a3 (patch)
tree12fda184624137d71806e32e87ddf99d361925bb
parent23b784c83c44f8c7492c007b6ca5a657b2ba016b (diff)
killing off stl in gbuild
-rw-r--r--sw/Library_msword.mk1
-rw-r--r--sw/Library_sw.mk3
-rw-r--r--sw/Library_swui.mk1
-rw-r--r--sw/Library_vbaswobj.mk1
4 files changed, 1 insertions, 5 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 507802ecdc..a05b6932be 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 4168c5fcda..6bcc9da593 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 9991435f15..10233944ba 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 f5cd44dc8a..eccaa8ef04 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 \