From ab451ff91e394a5f756558a9b27b39b55c43f075 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 2 Feb 2011 17:05:04 +0100
Subject: CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit
 linking of individual standard libs from makefiles; fix export problem in
 framework

---
 xmloff/Library_xo.mk  | 11 +----------
 xmloff/Library_xof.mk | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 1aa8b6407eae..71afa085d2cd 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
     tl \
     utl \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xo,\
@@ -379,15 +379,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/xforms/xformsimport \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,xo,\
-    dl \
-    icuuc \
-    m \
-    pthread \
-))
-endif
-
 ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,xo,\
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 55e3fbdd66ee..dca8b3901874 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
     salhelper \
     stl \
     xo \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,xof,\
@@ -90,15 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
     xmloff/source/transform/XMLFilterRegistration \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,xof,\
-    icuuc \
-    dl \
-    m \
-    pthread \
-))
-endif
-
 ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,xof,\
-- 
cgit