[Libreoffice-commits] .: Branch 'feature/gnumake4' - drawinglayer/Library_drawinglayer.mk framework/Library_fwe.mk idl/Executable_svidl.mk linguistic/Library_lng.mk xmlscript/Library_xcr.mk

[Bjoern Michaelsen]

 drawinglayer/Library_drawinglayer.mk |    3 +--
 framework/Library_fwe.mk             |    1 -
 idl/Executable_svidl.mk              |    1 -
 linguistic/Library_lng.mk            |   10 ++++------
 xmlscript/Library_xcr.mk             |    4 ++--
 5 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 57e9e0908d664bcf082a6d68faf39e1c95a0c274
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 20 13:24:12 2011 +0200

    gnumake4: fix buildbreakers from merge

diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 7aab083..5293778 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,drawinglayer,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,drawinglayer,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,drawinglayer,\
 	-DDRAWINGLAYER_DLLIMPLEMENTATION \
 ))
 
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 7665b91..51179c4 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -90,5 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/fwe/xml/xmlnamespaces \
 ))
 
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 # vim: set noet sw=4 ts=4:
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index a856cf7..da39f4d 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Executable_add_defs,svidl,\
 $(eval $(call gb_Executable_add_linked_libs,svidl,\
 	tl \
 	sal \
-	stl \
     $(gb_STDLIBS) \
 ))
 
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index d97278d..00fcc94 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -45,18 +45,16 @@ $(eval $(call gb_Library_add_defs,lng,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,lng,\
+	comphelper \
 	cppu \
 	cppuhelper \
-	comphelper \
-	vos3 \
-	tl \
 	i18nisolang1 \
-	svl \
-	stl \
 	sal \
-	xo \
+	svl \
+	tl \
 	ucbhelper \
 	utl \
+	xo \
     $(gb_STDLIBS) \
 ))
 
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index d3bb35c..d233475 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -43,10 +43,10 @@ $(eval $(call gb_Library_add_defs,xcr,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,xcr,\
-	sal \
+	comphelper \
 	cppu \
 	cppuhelper \
-	stl \
+	sal \
     $(gb_STDLIBS) \
 ))