Merge branch 'master' into feature/gnumake4

Conflicts:
	basebmp/prj/d.lst
	basebmp/test/basictest.cxx
	basebmp/test/makefile.mk
	basegfx/inc/basegfx/basegfxdllapi.h
	basegfx/inc/basegfx/tools/debugplotter.hxx
	basegfx/inc/basegfx/tuple/b2ituple.hxx
	basegfx/prj/d.lst
	basegfx/source/numeric/makefile.mk
	basegfx/source/polygon/makefile.mk
	basegfx/source/range/makefile.mk
	basegfx/source/raster/makefile.mk
	basegfx/source/tuple/makefile.mk
	basegfx/source/vector/makefile.mk
	basegfx/test/basegfx1d.cxx
	basegfx/test/makefile.mk
	basegfx/util/makefile.mk
	canvas/Library_canvasfactory.mk
	canvas/Module_canvas.mk
	canvas/prj/build.lst
	canvas/prj/d.lst
	canvas/source/cairo/cairo_canvashelper_texturefill.cxx
	canvas/source/cairo/makefile.mk
	canvas/source/tools/makefile.mk
	comphelper/qa/string/makefile.mk
	cppcanvas/Module_cppcanvas.mk
	cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
	cppcanvas/prj/build.lst
	cppcanvas/prj/d.lst
	cppcanvas/source/mtfrenderer/makefile.mk
	cppcanvas/util/makefile.mk
	i18npool/source/search/makefile.mk
	regexp/Library_regexp.mk
	regexp/prj/d.lst
	sax/CppunitTest_sax.mk
	sax/Library_sax.mk
	sax/prj/d.lst
	sax/qa/cppunit/test_converter.cxx
	sax/source/expatwrap/attrlistimpl.hxx
	sax/util/makefile.mk
	svtools/Library_svt.mk
	tools/Executable_sspretty.mk
	ucbhelper/prj/d.lst
	ucbhelper/source/provider/configureucb.cxx
	ucbhelper/source/provider/provconf.cxx
	ucbhelper/util/makefile.mk
	unotools/Library_utl.mk
	unotools/Module_unotools.mk
	unotools/Package_inc.mk
	unotools/prj/build.lst
	vcl/Library_desktop_detector.mk
	vcl/Library_vcl.mk
	vcl/Library_vclplug_gtk.mk
	vcl/aqua/source/gdi/salprn.cxx
	vcl/inc/aqua/saldata.hxx
	vcl/unx/generic/gdi/salgdi3.cxx

1 files changed, 110 insertions, 113 deletions

diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 19909abc82af..70647da701ca 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -1,31 +1,29 @@
-#*************************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
 #
-# OpenOffice.org - a multi-platform office productivity suite
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# This file is part of OpenOffice.org.
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
 #
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+# Major Contributor(s):
 #
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
+# For minor contributions see the git repository.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# unotools is the name of the module the makefile is located in
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
 
 # declare a library
 # utl is the name of the library as it is found in Repository.mk
@@ -44,113 +42,112 @@ $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
 
 # add any additional include paths for this library here
 $(eval $(call gb_Library_set_include,utl,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/unotools/inc \
-	-I$(SRCDIR)/unotools/inc/pch \
-	-I$(OUTDIR)/inc/offuh \
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/unotools/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
 ))
 
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
 $(eval $(call gb_Library_add_defs,utl,\
-	-DUNOTOOLS_DLLIMPLEMENTATION \
+    -DUNOTOOLS_DLLIMPLEMENTATION \
 ))
 
 # add libraries to be linked to utl; again these names need to be given as
 # specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,utl,\
-	sal \
-	salhelper \
-	stl \
-	comphelper \
-	ucbhelper \
-	cppu \
-	cppuhelper \
-	i18nisolang1 \
-	tl \
-	vos3 \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    tl \
+    ucbhelper \
     $(gb_STDLIBS) \
 ))
 
 # add all source files that shall be compiled with exceptions enabled
 # the name is relative to $(SRCROOT) and must not contain an extension
 $(eval $(call gb_Library_add_exception_objects,utl,\
-	unotools/source/streaming/streamhelper \
-	unotools/source/streaming/streamwrap \
-	unotools/source/accessibility/accessiblestatesethelper \
-	unotools/source/accessibility/accessiblerelationsethelper \
-	unotools/source/property/propertysethelper \
-	unotools/source/property/propertysetinfo \
-	unotools/source/misc/sharedunocomponent \
-	unotools/source/misc/componentresmodule \
-	unotools/source/misc/eventlisteneradapter \
-	unotools/source/misc/fontcvt \
-	unotools/source/misc/syslocale \
-	unotools/source/misc/fontdefs \
-	unotools/source/misc/datetime \
-	unotools/source/misc/atom \
-	unotools/source/misc/desktopterminationobserver \
-	unotools/source/processfactory/processfactory \
-	unotools/source/ucbhelper/localfilehelper \
-	unotools/source/ucbhelper/ucbstreamhelper \
-	unotools/source/ucbhelper/xtempfile \
-	unotools/source/ucbhelper/ucblockbytes \
-	unotools/source/ucbhelper/tempfile \
-	unotools/source/ucbhelper/ucbhelper \
-	unotools/source/ucbhelper/progresshandlerwrap \
-	unotools/source/config/historyoptions \
-	unotools/source/config/optionsdlg \
-	unotools/source/config/regoptions \
-	unotools/source/config/bootstrap \
-	unotools/source/config/configpathes \
-	unotools/source/config/javaoptions \
-	unotools/source/config/lingucfg \
-	unotools/source/config/fontoptions \
-	unotools/source/config/useroptions \
-	unotools/source/config/internaloptions \
-	unotools/source/config/viewoptions \
-	unotools/source/config/workingsetoptions \
-	unotools/source/config/fltrcfg \
-	unotools/source/config/localisationoptions \
-	unotools/source/config/itemholder1 \
-	unotools/source/config/cmdoptions \
-	unotools/source/config/cacheoptions \
-	unotools/source/config/docinfohelper \
-	unotools/source/config/inetoptions \
-	unotools/source/config/misccfg \
-	unotools/source/config/options \
-	unotools/source/config/xmlaccelcfg \
-	unotools/source/config/fontcfg \
-	unotools/source/config/startoptions \
-	unotools/source/config/extendedsecurityoptions \
-	unotools/source/config/printwarningoptions \
-	unotools/source/config/configmgr \
-	unotools/source/config/eventcfg \
-	unotools/source/config/configitem \
-	unotools/source/config/defaultoptions \
-	unotools/source/config/searchopt \
-	unotools/source/config/confignode \
-	unotools/source/config/sourceviewconfig \
-	unotools/source/config/compatibility \
-	unotools/source/config/pathoptions \
-	unotools/source/config/dynamicmenuoptions \
-	unotools/source/config/moduleoptions \
-	unotools/source/config/undoopt \
-	unotools/source/config/configvaluecontainer \
-	unotools/source/config/syslocaleoptions \
-	unotools/source/config/accelcfg \
-	unotools/source/config/saveopt \
-	unotools/source/config/securityoptions \
-	unotools/source/i18n/charclass \
-	unotools/source/i18n/textsearch \
-	unotools/source/i18n/readwritemutexguard \
-	unotools/source/i18n/intlwrapper \
-	unotools/source/i18n/transliterationwrapper \
-	unotools/source/i18n/calendarwrapper \
-	unotools/source/i18n/localedatawrapper \
-	unotools/source/i18n/collatorwrapper \
-	unotools/source/i18n/numberformatcodewrapper \
-	unotools/source/i18n/nativenumberwrapper \
+    unotools/source/accessibility/accessiblerelationsethelper \
+    unotools/source/accessibility/accessiblestatesethelper \
+    unotools/source/config/accelcfg \
+    unotools/source/config/bootstrap \
+    unotools/source/config/cacheoptions \
+    unotools/source/config/cmdoptions \
+    unotools/source/config/compatibility \
+    unotools/source/config/configitem \
+    unotools/source/config/configmgr \
+    unotools/source/config/confignode \
+    unotools/source/config/configpathes \
+    unotools/source/config/configvaluecontainer \
+    unotools/source/config/defaultoptions \
+    unotools/source/config/docinfohelper \
+    unotools/source/config/dynamicmenuoptions \
+    unotools/source/config/eventcfg \
+    unotools/source/config/extendedsecurityoptions \
+    unotools/source/config/fltrcfg \
+    unotools/source/config/fontcfg \
+    unotools/source/config/fontoptions \
+    unotools/source/config/historyoptions \
+    unotools/source/config/inetoptions \
+    unotools/source/config/internaloptions \
+    unotools/source/config/itemholder1 \
+    unotools/source/config/javaoptions \
+    unotools/source/config/lingucfg \
+    unotools/source/config/localisationoptions \
+    unotools/source/config/misccfg \
+    unotools/source/config/moduleoptions \
+    unotools/source/config/options \
+    unotools/source/config/optionsdlg \
+    unotools/source/config/pathoptions \
+    unotools/source/config/printwarningoptions \
+    unotools/source/config/regoptions \
+    unotools/source/config/saveopt \
+    unotools/source/config/searchopt \
+    unotools/source/config/securityoptions \
+    unotools/source/config/sourceviewconfig \
+    unotools/source/config/startoptions \
+    unotools/source/config/syslocaleoptions \
+    unotools/source/config/undoopt \
+    unotools/source/config/useroptions \
+    unotools/source/config/viewoptions \
+    unotools/source/config/workingsetoptions \
+    unotools/source/config/xmlaccelcfg \
+    unotools/source/i18n/calendarwrapper \
+    unotools/source/i18n/caserotate \
+    unotools/source/i18n/charclass \
+    unotools/source/i18n/collatorwrapper \
+    unotools/source/i18n/intlwrapper \
+    unotools/source/i18n/localedatawrapper \
+    unotools/source/i18n/nativenumberwrapper \
+    unotools/source/i18n/numberformatcodewrapper \
+    unotools/source/i18n/readwritemutexguard \
+    unotools/source/i18n/textsearch \
+    unotools/source/i18n/transliterationwrapper \
+    unotools/source/misc/atom \
+    unotools/source/misc/componentresmodule \
+    unotools/source/misc/datetime \
+    unotools/source/misc/desktopterminationobserver \
+    unotools/source/misc/eventlisteneradapter \
+    unotools/source/misc/fontcvt \
+    unotools/source/misc/fontdefs \
+    unotools/source/misc/sharedunocomponent \
+    unotools/source/misc/syslocale \
+    unotools/source/processfactory/processfactory \
+    unotools/source/property/propertysethelper \
+    unotools/source/property/propertysetinfo \
+    unotools/source/streaming/streamhelper \
+    unotools/source/streaming/streamwrap \
+    unotools/source/ucbhelper/localfilehelper \
+    unotools/source/ucbhelper/progresshandlerwrap \
+    unotools/source/ucbhelper/tempfile \
+    unotools/source/ucbhelper/ucbhelper \
+    unotools/source/ucbhelper/ucblockbytes \
+    unotools/source/ucbhelper/ucbstreamhelper \
+    unotools/source/ucbhelper/xtempfile \
 ))
 
 # vim: set noet sw=4 ts=4: