Fri Jun 17 05:42:19 PDT 2011

basebmp/CppunitTest_basebmp.mk      |    4 --
 basebmp/Library_basebmp.mk          |    3 -
 basegfx/Library_basegfx.mk          |    3 -
 basegfx/StaticLibrary_basegfx_s.mk  |    3 -
 canvas/Library_cairocanvas.mk       |    7 ---
 canvas/Library_canvasfactory.mk     |    4 --
 canvas/Library_canvastools.mk       |   18 +++------
 canvas/Library_directx5canvas.mk    |    6 +--
 canvas/Library_directx9canvas.mk    |    6 +--
 canvas/Library_gdipluscanvas.mk     |    6 +--
 canvas/Library_nullcanvas.mk        |    7 ---
 canvas/Library_simplecanvas.mk      |    7 ---
 canvas/Library_vclcanvas.mk         |    7 ---
 canvas/Module_canvas.mk             |    2 -
 comphelper/Library_comphelp.mk      |    3 -
 cppcanvas/Library_cppcanvas.mk      |    3 -
 padmin/Library_spa.mk               |    3 -
 regexp/Library_regexp.mk            |    3 -
 sax/Library_expwrap.mk              |    4 --
 sax/Library_fastsax.mk              |    7 ---
 sax/Library_sax.mk                  |    3 -
 sot/Library_sot.mk                  |    3 -
 svl/Library_svl.mk                  |    3 -
 svtools/Library_svt.mk              |    3 -
 toolkit/Library_tk.mk               |    3 -
 tools/Library_tl.mk                 |    3 -
 ucbhelper/Library_ucbhelper.mk      |    3 -
 unotools/Library_utl.mk             |    3 -
 vcl/Library_desktop_detector.mk     |   13 ++++--
 vcl/Library_vcl.mk                  |   68 ++++++++++++------------------------
 vcl/Library_vclplug_gen.mk          |   47 ++++++++++--------------
 vcl/Library_vclplug_gtk.mk          |   23 +++++-------
 vcl/Library_vclplug_kde.mk          |   19 +++++-----
 vcl/Library_vclplug_kde4.mk         |   19 +++++-----
 vcl/Library_vclplug_svp.mk          |   10 +++--
 vcl/aqua/source/app/vclnsapp.mm     |   26 ++++++++++---
 vcl/aqua/source/gdi/salgdi.cxx      |    4 +-
 vcl/aqua/source/window/salframe.cxx |    5 ++
 vcl/inc/aqua/saldata.hxx            |    3 +
 vcl/source/gdi/pdfwriter_impl.cxx   |    3 -
 vcl/source/gdi/print2.cxx           |    1 
 vcl/unx/generic/gdi/salgdi3.cxx     |    4 --
 vcl/win/source/gdi/salgdi3.cxx      |    4 +-
 43 files changed, 153 insertions(+), 226 deletions(-)

New commits:
commit 13ffcfdb684648675635aa6dac4ba6813d3d7fd7
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:41 2011 +0000

    gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]

diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index ae4b6bb..719b97b 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -48,8 +48,4 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,basebmp_test,\
-	$$(INCLUDE) \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index a835c41..0a2dffd 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_set_include,basebmp,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,basebmp,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,basebmp,\
 	-DBASEBMP_DLLIMPLEMENTATION \
 ))
 
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index cef63ab..7fc527f 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,basegfx,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,basegfx,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,basegfx,\
 	-DBASEGFX_DLLIMPLEMENTATION \
 ))
 
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 3c871fd..36f6117 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -44,8 +44,7 @@ $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
 # this means that all code of this static library will end in a dll
 # thus the _DLL define must be set to avoid link problems with stlport symbols
 # the BASEGFX_STATICLIBRARY define will expand all BASEGFX_DLLPRIVATE/PUBLIC macros to nothing
-$(eval $(call gb_StaticLibrary_set_defs,basegfx_s,\
-	$$(DEFS) \
+$(eval $(call gb_StaticLibrary_add_defs,basegfx_s,\
 	-DBASEGFX_STATICLIBRARY \
 	-D_DLL \
 ))
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 02b7fc3..e1b7182 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,cairocanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,cairocanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,cairocanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 4992f9c..8078e48 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -36,10 +36,6 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,canvasfactory,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,canvasfactory,\
 	sal \
 	stl \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index f686e74..32f6ff5 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -38,21 +38,18 @@ $(eval $(call gb_Library_set_include,canvastools,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DCANVASTOOLS_DLLIMPLEMENTATION \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DVERBOSE \
 ))
 endif
 
 ifneq ($(strip $(PROFILER)$(profiler)),)
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DPROFILER \
 ))
 endif
@@ -87,7 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
 	canvas/source/tools/verifyinput \
 ))
 
-ifeq ($(strip $(ENABLE_AGG)),YES) 
+ifeq ($(strip $(ENABLE_AGG)),YES)
 $(eval $(call gb_Library_add_exception_objects,canvastools,\
 	canvas/source/tools/bitmap \
 	canvas/source/tools/image \
@@ -95,9 +92,8 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
 $(eval $(call gb_Library_add_linked_libs,canvastools,\
 	agg \
 ))
-ifneq ($(strip $(AGG_VERSION)),) 
-$(eval $(call gb_Library_set_defs,canvastools,\
-	$$(DEFS) \
+ifneq ($(strip $(AGG_VERSION)),)
+$(eval $(call gb_Library_add_defs,canvastools,\
 	-DAGG_VERSION=$(AGG_VERSION) \
 ))
 endif
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index f3356fd..4413909 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -37,14 +37,12 @@ $(eval $(call gb_Library_set_include,directx5canvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,directx5canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
 	-DDIRECTX_VERSION=0x0500 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx5canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx5canvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 06a4dc0..cb8264d 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,directx9canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
 	-DDIRECTX_VERSION=0x0900 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,directx9canvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,directx9canvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index db29526..f5b2bc3 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -36,14 +36,12 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DDIRECTX_VERSION=0x0900 \
 ))
 
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,gdipluscanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,gdipluscanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index e2403d3..ecd7b86 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -34,13 +34,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,nullcanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,nullcanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,nullcanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 570e728..831177f 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,simplecanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,simplecanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,simplecanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 501fe3a..5d5cf78 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -36,13 +36,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,vclcanvas,\
-	$$(DEFS) \
-))
-
 ifneq ($(strip $(VERBOSE)$(verbose)),)
-$(eval $(call gb_Library_set_defs,vclcanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclcanvas,\
 	-DVERBOSE \
 ))
 endif
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 0228d80..c50153b 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,comphelper,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,comphelper,\
-       $$(DEFS) \
+$(eval $(call gb_Library_add_defs,comphelper,\
        -DCOMPHELPER_DLLIMPLEMENTATION \
 ))
 
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index c772811..81aeb98 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,cppcanvas,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,cppcanvas,\
 	-DCPPCANVAS_DLLIMPLEMENTATION \
 ))
 
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index cb74c4f..5793f79 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -33,8 +33,7 @@ $(eval $(call gb_Library_set_include,spa,\
     -I$(OUTDIR)/inc/stl \
 ))
 
-$(eval $(call gb_Library_set_defs,spa,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,spa,\
     -DSPA_DLLIMPLEMENTATION \
 ))
 
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 4f6f0ec..463892d 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Library_set_include,i18nregexp,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,i18nregexp,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,i18nregexp,\
 	-DREGEXP_DLLIMPLEMENTATION \
 ))
 
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 6bea2f3..174d222 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,expwrap,\
 	-I$(SRCDIR)/sax/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,expwrap,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,expwrap,\
 	sal \
 	cppu \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index e45fa50..62e4570 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Library_set_include,fastsax,\
 	-I$(SRCDIR)/sax/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,fastsax,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,fastsax,\
 	sal \
 	cppu \
@@ -49,8 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
 ))
 
 ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,fastsax,\
 	-DSYSTEM_ZLIB \
 ))
 endif
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 36e0066..d43c7f8 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,sax,\
 	-I$(SRCDIR)/sax/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,sax,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sax,\
 	-DSAX_DLLIMPLEMENTATION \
 ))
 
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index ef7d22c..2f851f1 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,sot,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,sot,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sot,\
     -DSOT_DLLIMPLEMENTATION \
 ))
 
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 0ad3ecc..97a8ae1 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_set_include,svl,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svl,\
     -DSVL_DLLIMPLEMENTATION \
 ))
 
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a06a238..a21f359 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -46,8 +46,7 @@ $(eval $(call gb_Library_set_include,svt,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svt,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
     -DSVT_DLLIMPLEMENTATION \
 ))
 
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index b370793..44bd96e 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tk,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,tk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tk,\
     -DTOOLKIT_DLLIMPLEMENTATION \
 ))
 
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 234ff7c..72a4e67 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tl,\
     -I$(OUTDIR)/inc/stl \
 ))
 
-$(eval $(call gb_Library_set_defs,tl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tl,\
     -DTOOLS_DLLIMPLEMENTATION \
     -DVCL \
 ))
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 108c619..754c1e7 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,ucbhelper,\
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,ucbhelper,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,ucbhelper,\
 	-DUCBHELPER_DLLIMPLEMENTATION \
 ))
 
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index dbd32ac..19909ab 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -52,8 +52,7 @@ $(eval $(call gb_Library_set_include,utl,\
 
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,utl,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,utl,\
 	-DUNOTOOLS_DLLIMPLEMENTATION \
 ))
 
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 8f18f7a..33ef214 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,desktop_detector,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,desktop_detector,\
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2b1c0df..900ac3a 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -53,8 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 ))
 endif
 
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
     -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
     -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
@@ -95,8 +94,7 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
     $(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DCAIRO \
 ))
 endif
@@ -170,22 +168,19 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 endif
 
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
     -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 ## handle fontconfig
 ifneq ($(ENABLE_FONTCONFIG),)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_FONTCONFIG \
 ))
 ## handle CUPS
 ifneq ($(ENABLE_CUPS),)
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_CUPS \
 ))
 endif
@@ -419,8 +414,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 ## handle Graphite
 ifneq ($(ENABLE_GRAPHITE),)
 # add defines, graphite sources for all platforms
-$(eval $(call gb_Library_set_defs,vcl,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_GRAPHITE \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 1c79bda..4eec276 100755
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -115,8 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/window/salobj \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
     -DVCLPLUG_GEN_IMPLEMENTATION \
 ))
@@ -124,8 +123,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
 
 ## handle RandR 
 ifneq ($(ENABLE_RANDR),)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DUSE_RANDR \
 ))
 ifeq ($(XRANDR_DLOPEN),FALSE)
@@ -137,8 +135,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
     $(XRANDR_LIBS) \
 ))
 else
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DXRANDR_DLOPEN \
 ))
 endif
@@ -148,8 +145,7 @@ endif
 ifneq ($(USE_XINERAMA),NO)
 ifneq ($(OS),SOLARIS)
 # not Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DUSE_XINERAMA_XORG \
 ))
 ifeq ($(XINERAMA_LINK),dynamic)
@@ -163,8 +159,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
 endif
 else
 # Solaris
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DUSE_XINERAMA_XSUN \
 ))
 ifeq ($(USE_XINERAMA_VERSION),Xorg)
@@ -184,8 +179,7 @@ endif
 
 ## handle Render linking
 ifeq ($(XRENDER_LINK),YES)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DXRENDER_LINK \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 59aa6e8..039ab34 100755
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -42,15 +42,13 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
     $$(GTK_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DVCLPLUG_GTK_IMPLEMENTATION \
     -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
 ifneq ($(ENABLE_DBUS),)
-$(eval $(call gb_Library_set_defs,vclplug_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DENABLE_DBUS \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_gtk,\
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 5658b1e..b751630 100755
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
     $$(KDE_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 317f10c..49626f4 100755
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
     $$(KDE4_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde4,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 64b5f56..e68d6c2 100755
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_svp,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vclplug_svp,\
     -DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
commit 03dde47a6c31b562cb4adbc4cc9328dec2d509b2
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:40 2011 +0000

    gnumake4: #i117610#: move icule to RepositoryExternal.mk [hg:e86f5a26e982]

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index c4eb08f..8f18f7a 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -72,6 +70,11 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
 	$(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,desktop_detector,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
 ))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 360ccfe..2b1c0df 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -68,8 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -81,6 +79,11 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vcl,\
+	icule \
+	icuuc \
+)
+
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     freetype \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 263d7b1..1c79bda 100755
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -63,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_gen,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/app/i18n_cb \
     vcl/unx/generic/app/i18n_ic \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index f81c784..59aa6e8 100755
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -73,8 +73,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -90,6 +88,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_gtk,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
     vcl/unx/gtk/a11y/atkaction \
     vcl/unx/gtk/a11y/atkbridge \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 3266670..5658b1e 100755
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
     ICE \
 ))
 
+$(call gb_Library_use_externals,vclplug_kde,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
     vcl/unx/kde/kdedata \
     vcl/unx/kde/salnativewidgets-kde \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 7bca89b..317f10c 100755
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
     basegfx \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
     ICE \
 ))
 
+$(call gb_Library_use_externals,vclplug_kde4,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
     vcl/unx/kde4/KDEData \
     vcl/unx/kde4/KDESalDisplay \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 3051c0c..64b5f56 100755
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -52,8 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
     basebmp \
     comphelper \
     cppuhelper \
-    icuuc \
-    icule \
     i18nisolang1 \
     i18npaper \
     i18nutil \
@@ -69,6 +67,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_externals,vclplug_svp,\
+	icule \
+	icuuc \
+)
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
     vcl/unx/generic/printergfx/bitmap_gfx \
     vcl/unx/generic/printergfx/common_gfx \
commit 93b70460f3fcfeeec9fb74fe630e66552fda2c26
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:39 2011 +0000

    gnumake4: #i117610#: move graphite to RepositoryExternal.mk [hg:ca1349af0566]

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 82fb39d..360ccfe 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -427,37 +427,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_textsrc \
 ))
 
-#building with stlport, but graphite was not built with stlport
-ifneq ($(USE_SYSTEM_STL),YES)
-ifeq ($(SYSTEM_GRPAHITE),YES)
-$(eval $(call gb_Library_set_defs,vcl,\
-	$$(DEFS) \
-	-DADAPT_EXT_STL \
-))
-endif
-endif
-
 # handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_adaptors \
     vcl/source/glyphs/graphite_serverfont \
 ))
-ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_add_libs,vcl,\
-    $(GRAPHITE_LIBS) \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite \
-))
-endif
-endif
-# on windows link static graphite library
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
-    graphite \
-))
 endif
 endif
 
@@ -479,6 +454,8 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib \
 ))
 endif
+
+$(call gb_Library_use_external,vcl,graphite)
 endif
 
 ifeq ($(GUIBASE),aqua)
commit e7590c886d2ef7673e5d2a56e404e2cb0d218f52
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:39 2011 +0000

    gnumake4: vcl: adapt makefiles to gnumake4 changes [hg:4a760b654a05]

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2b50b1e..82fb39d 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -47,8 +47,8 @@ $(eval $(call gb_Library_set_include,vcl,\
     -I$(OUTDIR)/inc \
 ))
 ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+	$$(INCLUDE) \
     $$(FREETYPE_CFLAGS) \
 ))
 endif
@@ -88,9 +88,8 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 endif
 
 ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
 $(eval $(call gb_Library_set_defs,vcl,\
@@ -445,8 +444,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_serverfont \
 ))
 ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
     $(GRAPHITE_LIBS) \
 ))
 else
@@ -473,13 +471,11 @@ endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib/64 \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     -R/usr/sfw/lib \
 ))
 endif
@@ -489,8 +485,7 @@ ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     AppleRemote \
 ))
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
     -framework QuickTime \
     -framework Cocoa \
     -framework Carbon \
@@ -499,8 +494,7 @@ $(eval $(call gb_Library_set_ldflags,vcl,\
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_ldflags,vcl,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
     /ENTRY:LibMain at 12 \
 ))
 $(eval $(call gb_Library_add_linked_libs,vcl,\
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 52f4d7a..263d7b1 100755
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -126,12 +126,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
     -DUSE_RANDR \
 ))
 ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+	$$(INCLUDE) \
     $$(XRANDR_CFLAGS) \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     $(XRANDR_LIBS) \
 ))
 else
@@ -151,13 +150,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
     -DUSE_XINERAMA_XORG \
 ))
 ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -lXinerama \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
@@ -170,13 +167,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
 ifeq ($(USE_XINERAMA_VERSION),Xorg)
 # Solaris, Xorg
 ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -lXinerama \
 ))
 else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
@@ -190,8 +185,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\
     $$(DEFS) \
     -DXRENDER_LINK \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
     $(shell pkg-config --libs xrender) \
 ))
 endif
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index feb63e0..f81c784 100755
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+	$$(INCLUDE) \
     $$(GTK_CFLAGS) \
 ))
 
@@ -53,14 +53,12 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\
     $$(DEFS) \
     -DENABLE_DBUS \
 ))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
     $(shell pkg-config --libs dbus-glib-1)\
 ))
 endif
 
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
     $$(GTK_LIBS) \
     $$(GTHREAD_LIBS) \
 ))
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index a3fc455..3266670 100755
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vclplug_kde,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+	$$(INCLUDE) \
     $$(KDE_CFLAGS) \
 ))
 
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
-    $$(KDE_LIBS)\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+    $$(KDE_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 30fc756..7bca89b 100755
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vclplug_kde4,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+	$$(INCLUDE) \
     $$(KDE4_CFLAGS) \
 ))
 
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
-    $$(KDE4_LIBS)\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+    $$(KDE4_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
commit 4ac291d90023feb478ada2ad337d4f802a114b90
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 16:11:39 2011 +0000

    gnumake4: adapt makefiles [hg:ec87fcbfae8b]

diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 4c26e74..8c1970b 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Module_add_targets,canvas,\
 endif
 endif
 
-ifneq ($(strip $(ENABLE_CAIRO)),)
+ifneq ($(strip $(ENABLE_CAIRO_CANVAS)),)
 $(eval $(call gb_Module_add_targets,canvas,\
 	Library_cairocanvas \
 ))
commit d9242b045c074aa98e61148f1e72beeaa354542f
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Apr 13 15:28:03 2011 +0000

    ooo340fixes: Library_desktop_detector.mk: add gb_STDLIBS [hg:512cd27383d9]

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index f72a9ff..c4eb08f 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     Xext \
     SM \
     ICE \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
commit 4f988b6e4c2ba364e875f041fcbb789aa6e19dd9
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Wed Apr 13 13:17:51 2011 +0200

    ooo340fixes: fix some gnumake migration leftovers [hg:4624ad74b5c1]

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 49151cb..f72a9ff 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,desktop_detector,\
     -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,vclplug_kde,\
+$(eval $(call gb_Library_set_defs,desktop_detector,\
     $$(DEFS) \
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     ICE \
 ))
 
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
 ))
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ae7e52e..2b50b1e 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -93,7 +93,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\
     $$(OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
-$(eval $(call gb_Library_set_defs,vclplug_gen,\
+$(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
     -DCAIRO \
 ))
commit ebfbacf511356e3963ad30b68f709b41b8d055bd
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Tue Apr 12 20:37:07 2011 +0200

    ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384]

diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 58ae3ed..8a3ea8b 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -350,11 +350,7 @@ CairoWrapper::CairoWrapper()
     if( !XQueryExtension( GetX11SalData()->GetDisplay()->GetDisplay(), "RENDER", &nDummy, &nDummy, &nDummy ) )
         return;
 
-#ifdef MACOSX
-    OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.2.dylib" ));
-#else
     OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
-#endif    
     mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
     if( !mpCairoLib )
         return;
commit ba101fff1370ade22cdba94ba2ed32897f0984a8
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Wed Apr 6 11:56:51 2011 +0200

    ooo34gsl10: #i117587# handle application resigning/becoming active during presentation [hg:98a8c4a45d03]

diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index cfb4d5e..fc4945e 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -453,37 +453,51 @@
 - (void)applicationWillBecomeActive:(NSNotification *)pNotification
 {
     (void)pNotification;
-    if (GetSalData()->mpMainController->remoteControl) {
-
+    SalData* pSalData = GetSalData();
+    if (pSalData->mpMainController->remoteControl)
+    {
         // [remoteControl startListening: self];
         // does crash because the right thing to do is 
         // [GetSalData()->mpMainController->remoteControl startListening: self];
         // but the instance variable 'remoteControl' is declared protected
         // workaround : declare remoteControl instance variable as public in RemoteMainController.m
 
-        [GetSalData()->mpMainController->remoteControl startListening: self];
+        [pSalData->mpMainController->remoteControl startListening: self];
 #ifdef DEBUG
         NSLog(@"Apple Remote will become active - Using remote controls");
 #endif
     }
+    for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
+         it != pSalData->maPresentationFrames.end(); ++it )
+    {
+        [(*it)->mpWindow setLevel: NSPopUpMenuWindowLevel];
+        if( [(*it)->mpWindow isVisible] )
+            [(*it)->mpWindow orderFront: NSApp];
+    }
 }
 
 - (void)applicationWillResignActive:(NSNotification *)pNotification
 {
     (void)pNotification;
-    if (GetSalData()->mpMainController->remoteControl) {
-
+    SalData* pSalData = GetSalData();
+    if (pSalData->mpMainController->remoteControl)
+    {
         // [remoteControl stopListening: self];
         // does crash because the right thing to do is 
         // [GetSalData()->mpMainController->remoteControl stopListening: self];
         // but the instance variable 'remoteControl' is declared protected
         // workaround : declare remoteControl instance variable as public in RemoteMainController.m
 
-        [GetSalData()->mpMainController->remoteControl stopListening: self]; 
+        [pSalData->mpMainController->remoteControl stopListening: self]; 
 #ifdef DEBUG
         NSLog(@"Apple Remote will resign active - Releasing remote controls");
 #endif
     }
+    for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
+         it != pSalData->maPresentationFrames.end(); ++it )
+    {
+        [(*it)->mpWindow setLevel: NSNormalWindowLevel];
+    }
 }
 
 - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index efa57c2..898e3cb 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -120,6 +120,7 @@ AquaSalFrame::~AquaSalFrame()
     SalData* pSalData = GetSalData();
     pSalData->maFrames.remove( this );
     pSalData->maFrameCheck.erase( this );
+    pSalData->maPresentationFrames.remove( this );
     
     DBG_ASSERT( this != s_pCaptureFrame, "capture frame destroyed" );
     if( this == s_pCaptureFrame )
@@ -853,13 +854,15 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
     
     if( bStart )
     {
+        GetSalData()->maPresentationFrames.push_back( this );
         mpActivityTimer.reset( new PreventSleepTimer() );
-        [mpWindow setLevel: NSScreenSaverWindowLevel];
+        [mpWindow setLevel: NSPopUpMenuWindowLevel];
         if( mbShown )
             [mpWindow makeMainWindow];
     }
     else
     {
+        GetSalData()->maPresentationFrames.remove( this );
         mpActivityTimer.reset();
         [mpWindow setLevel: NSNormalWindowLevel];
     }
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index 6cd8d67..f77dbdd 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -83,8 +83,9 @@ struct SalData
     
     SALTIMERPROC                                  mpTimerProc;		// timer callback proc
     AquaSalInstance                              *mpFirstInstance;	// pointer of first instance
-    std::list<AquaSalFrame*>                      maFrames;	        // pointer of first frame
+	std::list<AquaSalFrame*>                      maFrames;	        // list of all frames
     std::hash_set<const AquaSalFrame*,FrameHash>  maFrameCheck;     // for fast check of frame existance
+	std::list<AquaSalFrame*>                      maPresentationFrames;  // list of frames in presentation mode
     SalObject                                    *mpFirstObject;	// pointer of first object window
     SalVirtualDevice                             *mpFirstVD;    	// first VirDev
     SalPrinter                                   *mpFirstPrinter; 	// first printing printer
commit 65d4e864b333a7893db302da7aa3f796b53c5dab
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Tue Apr 5 13:24:02 2011 +0200

    ooo34gsl01: #i109820# honor background color just calculated [hg:07982b9dd204]

diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index ab8edf2..4addc6a 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1226,6 +1226,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                         aMapVDev.EnableOutput(sal_False);
 
                         VirtualDevice 	aPaintVDev; // into this one, we render.
+                        aPaintVDev.SetBackground( aBackgroundComponent.aBgColor );
 
                         rOutMtf.AddAction( new MetaPushAction( PUSH_MAPMODE ) );
                         rOutMtf.AddAction( new MetaMapModeAction() );
commit 5adfd53fae85ad268dda2a22e39ed4f9b07c3ac5
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date:   Mon Apr 4 18:14:44 2011 +0200

    ooo34gsl01: #i117583# remove wrong linecolor test [hg:14801dbb3afa]

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a179874..61d4d66 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10233,9 +10233,6 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
 
     updateGraphicsState();
 
-    if( m_aGraphicsStack.front().m_aLineColor == Color( COL_TRANSPARENT ) &&
-        m_aGraphicsStack.front().m_aFillColor == Color( COL_TRANSPARENT ) )
-        return;
     if( rPolyPoly.Count() )
     {
         PolyPolygon		aPolyPoly( rPolyPoly );
commit 4e71d7ae694005a2d353b2e90a61c745d63a4690
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date:   Mon Apr 4 17:44:53 2011 +0200

    ooo34gsl01: #i117131# use correct sign for TTFontInfo [hg:d1476b062da5]

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 8232551..8214522 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -2229,8 +2229,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     rInfo.m_aFontBBox	= Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
     rInfo.m_nCapHeight	= aTTInfo.yMax; // Well ...
-    rInfo.m_nAscent	    = +aTTInfo.winAscent;
-    rInfo.m_nDescent    = -aTTInfo.winDescent;
+	rInfo.m_nAscent     = aTTInfo.winAscent;
+	rInfo.m_nDescent    = aTTInfo.winDescent;
     // mac fonts usually do not have an OS2-table
     // => get valid ascent/descent values from other tables
     if( !rInfo.m_nAscent )
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 40f6913..1f6bec3 100755
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2788,8 +2788,8 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     ::GetTTGlobalFontInfo( aSftTTF.get(), &aTTInfo );
     rInfo.m_nFontType   = FontSubsetInfo::SFNT_TTF;
     rInfo.m_aPSName     = ImplSalGetUniString( aTTInfo.psname );
-    rInfo.m_nAscent	    = +aTTInfo.winAscent;
-    rInfo.m_nDescent    = -aTTInfo.winDescent;
+    rInfo.m_nAscent	    = aTTInfo.winAscent;
+    rInfo.m_nDescent    = aTTInfo.winDescent;
     rInfo.m_aFontBBox	= Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
     rInfo.m_nCapHeight	= aTTInfo.yMax; // Well ...
commit 1290b6d074970bfd2a214f43f80f1fcd607b8492
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date:   Mon Apr 4 11:48:30 2011 +0200

    ooo34gsl01: #i117680# add a missing backslash [hg:3c06e9441b58]

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 558e1ec..ae7e52e 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -447,7 +447,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 ifeq ($(SYSTEM_GRAPHITE),YES)
 $(eval $(call gb_Library_set_ldflags,vcl,\
     $$(LDFLAGS) \
-    $(GRAPHITE_LIBS)
+    $(GRAPHITE_LIBS) \
 ))
 else
 $(eval $(call gb_Library_add_linked_static_libs,vcl,\
commit 24ccf9c1322f02d01c7f90fd885c874a7488224b
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date:   Mon Apr 4 11:46:36 2011 +0200

    ooo34gsl01: #i117680# add ADAPT_EXT_STL define as was before gnumake conversion [hg:43c445bd771c]

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7e22695..558e1ec 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -427,6 +427,17 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_layout \
     vcl/source/glyphs/graphite_textsrc \
 ))
+
+#building with stlport, but graphite was not built with stlport
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(SYSTEM_GRPAHITE),YES)
+$(eval $(call gb_Library_set_defs,vcl,\
+	$$(DEFS) \
+	-DADAPT_EXT_STL \
+))
+endif
+endif
+
 # handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
commit d3f042f5264fb5865b9069f6b5845e82d8d8b29f
Author: Philipp Lohmann [pl] <Philipp.Lohmann at oracle.com>
Date:   Mon Apr 4 11:40:41 2011 +0200

    ooo34gsl01: #i117680# fixup graphite_dll as static library [hg:859f1dffdb89]

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e8ad1bc..7e22695 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -81,13 +81,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     $(gb_STDLIBS) \
 ))
 
-ifneq ($(ENABLE_GRAPHITE),)
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    graphite_dll \
-))
-endif
-endif
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     freetype \
@@ -423,6 +416,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 
 ## handle Graphite
 ifneq ($(ENABLE_GRAPHITE),)
+# add defines, graphite sources for all platforms
 $(eval $(call gb_Library_set_defs,vcl,\
     $$(DEFS) \
     -DENABLE_GRAPHITE \
@@ -433,6 +427,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_layout \
     vcl/source/glyphs/graphite_textsrc \
 ))
+# handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_adaptors \
@@ -449,6 +444,12 @@ $(eval $(call gb_Library_add_linked_static_libs,vcl,\
 ))
 endif
 endif
+# on windows link static graphite library
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_static_libs,vcl,\
+    graphite \
+))
+endif
 endif
 
 ifeq ($(OS),LINUX)
