From 25f8330004409edf8007df0cc80ef540c03d18da Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 9 Feb 2012 22:31:30 +0200
Subject: Add fw* and sfx to libmerged

---
 Library_merged.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Library_merged.mk')

diff --git a/Library_merged.mk b/Library_merged.mk
index 742a6fb1ea01..6d2d90806828 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -28,14 +28,12 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	fwe \
 	i18nisolang1 \
 	i18npaper \
 	sal \
 	salhelper \
 	sax \
 	sb \
-	sfx \
 	sot \
 	svl \
 	svt \
@@ -50,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
 	icuuc \
+	libxml2 \
 	zlib \
 ))
 
@@ -77,4 +76,11 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,merged,\
+    objc \
+    Cocoa \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
-- 
cgit