cppuhelper: convert to gbuild

missing subsequent test qa/propertysetmixin/makefile.mk

cppuhelper: convert to gbuild
missing subsequent test qa/propertysetmixin/makefile.mk
b222aa8f · Matúš Kukan · Stephan Bergmann · bd46aa59 · b222aa8f · b222aa8f
Kaydet (Commit) b222aa8f authored Agu 23, 2011 tarafından Matúš Kukan Kaydeden (comit) Stephan Bergmann Ock 02, 2012
24 changed files
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_cppu_ifcontainer))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\
+    cppuhelper/qa/ifcontainer/cppu_ifcontainer \
+))
+
+$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_cppu_unourl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\
+    cppuhelper/qa/unourl/cppu_unourl \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_qa_weak))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\
+    cppuhelper/qa/weak/test_weak \
+))
+
+$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\
+	cppu \
+    cppuhelper \
+	sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_Library_Library,cppuhelper))
+
+$(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
+
+$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_generated))
+$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc))
+
+$(eval $(call gb_Library_set_include,cppuhelper,\
+	-I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,cppuhelper,\
+	-DCPPUHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
+	cppu \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,cppuhelper,\
+	cppuhelper/source/findsofficepath \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppuhelper,\
+	cppuhelper/source/access_control \
+	cppuhelper/source/bootstrap \
+	cppuhelper/source/component_context \
+	cppuhelper/source/component \
+	cppuhelper/source/exc_thrower \
+	cppuhelper/source/factory \
+	cppuhelper/source/implbase \
+	cppuhelper/source/implbase_ex \
+	cppuhelper/source/implementationentry \
+	cppuhelper/source/interfacecontainer \
+	cppuhelper/source/macro_expander \
+	cppuhelper/source/propertysetmixin \
+	cppuhelper/source/propshlp \
+	cppuhelper/source/servicefactory \
+	cppuhelper/source/shlib \
+	cppuhelper/source/stdidlclass \
+	cppuhelper/source/tdmgr \
+	cppuhelper/source/typeprovider \
+	cppuhelper/source/unourl \
+	cppuhelper/source/weak \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/inc/makefile.mk
+++ b/cppuhelper/inc/makefile.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,16 +25,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..

-PRJNAME=cppuhelper
-TARGET=inc
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else

-# --- Settings -----------------------------------------------------
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk

-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))

-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+endif

-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_Module_Module,cppuhelper))
+
+$(eval $(call gb_Module_add_targets,cppuhelper,\
+	Library_cppuhelper \
+	Package_findsofficepath \
+	Package_inc \
+	Package_unorc \
+	Package_unotypes \
+))
+
+$(eval $(call gb_Module_add_check_targets,cppuhelper,\
+	CppunitTest_cppuhelper_cppu_ifcontainer \
+	CppunitTest_cppuhelper_cppu_unourl \
+	CppunitTest_cppuhelper_qa_weak \
+))
+
+# TODO ? (I don't think OOO_SUBSEQUENT_TESTS != "" can be true..
+# someone would have to do it on command line)
+#	qa/propertysetmixin/makefile.mk
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Package_findsofficepath.mk
+++ b/cppuhelper/Package_findsofficepath.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+# UGLY HACK for odk/source/unoapploader/ where we need findsofficepath.o
+$(eval $(call gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source))
+
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o))
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Package_inc.mk
+++ b/cppuhelper/Package_inc.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_Package_Package,cppuhelper_inc,$(SRCDIR)/cppuhelper/inc))
+
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/cppuhelperdllapi.h,cppuhelper/cppuhelperdllapi.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/access_control.hxx,cppuhelper/access_control.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/basemutex.hxx,cppuhelper/basemutex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/bootstrap.hxx,cppuhelper/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase10.hxx,cppuhelper/compbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase11.hxx,cppuhelper/compbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase12.hxx,cppuhelper/compbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase1.hxx,cppuhelper/compbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase2.hxx,cppuhelper/compbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase3.hxx,cppuhelper/compbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase4.hxx,cppuhelper/compbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase5.hxx,cppuhelper/compbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase6.hxx,cppuhelper/compbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase7.hxx,cppuhelper/compbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase8.hxx,cppuhelper/compbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase9.hxx,cppuhelper/compbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase_ex.hxx,cppuhelper/compbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase.hxx,cppuhelper/compbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component_context.hxx,cppuhelper/component_context.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component.hxx,cppuhelper/component.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/exc_hlp.hxx,cppuhelper/exc_hlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/factory.hxx,cppuhelper/factory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/findsofficepath.h,cppuhelper/findsofficepath.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase10.hxx,cppuhelper/implbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase11.hxx,cppuhelper/implbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase12.hxx,cppuhelper/implbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase1.hxx,cppuhelper/implbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase2.hxx,cppuhelper/implbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase3.hxx,cppuhelper/implbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase4.hxx,cppuhelper/implbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase5.hxx,cppuhelper/implbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase6.hxx,cppuhelper/implbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase7.hxx,cppuhelper/implbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase8.hxx,cppuhelper/implbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase9.hxx,cppuhelper/implbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex.hxx,cppuhelper/implbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_post.hxx,cppuhelper/implbase_ex_post.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_pre.hxx,cppuhelper/implbase_ex_pre.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase.hxx,cppuhelper/implbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implementationentry.hxx,cppuhelper/implementationentry.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.h,cppuhelper/interfacecontainer.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.hxx,cppuhelper/interfacecontainer.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propertysetmixin.hxx,cppuhelper/propertysetmixin.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propshlp.hxx,cppuhelper/propshlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.h,cppuhelper/proptypehlp.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.hxx,cppuhelper/proptypehlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.hxx,cppuhelper/queryinterface.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/servicefactory.hxx,cppuhelper/servicefactory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/stdidlclass.hxx,cppuhelper/stdidlclass.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakagg.hxx,cppuhelper/weakagg.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weak.hxx,cppuhelper/weak.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakref.hxx,cppuhelper/weakref.hxx))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Package_unorc.mk
+++ b/cppuhelper/Package_unorc.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_Package_Package,cppuhelper_unorc,$(SRCDIR)/cppuhelper/source))
+
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,bin/uno.ini,unorc))
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,lib/unorc,unorc))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/Package_unotypes.mk
+++ b/cppuhelper/Package_unotypes.mk
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_Package_Package,cppuhelper_generated))
+
+$(eval $(call gb_Package_add_customtarget,cppuhelper_generated,cppuhelper/unotypes))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppuhelper/unotypes,\
+	$(gb_UnoApiTarget_CPPUMAKERTARGET) \
+	$(gb_UnoApiTarget_IDLCTARGET) \
+	$(gb_UnoApiTarget_REGMERGETARGET) \
+	$(OUTDIR_FOR_BUILD)/bin/types.rdb \
+	$(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
 ch	cppuhelper	:	BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi NULL
-ch	cppuhelper								usr1	-	all	ch_mkout NULL
-ch	cppuhelper\inc							nmake	-	all	ch_include NULL
-ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
-ch	cppuhelper\unotypes						nmake	-	all	ch_unotypes NULL
-ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
-ch  cppuhelper\qa\ifcontainer               nmake   -   all ch_qa_ifcontainer ch_source NULL
-ch  cppuhelper\qa\unourl                    nmake   -   all ch_qa_unourl ch_source NULL
+ch	cppuhelper\prj							nmake	-	all	ch_prj NULL
+ch  cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_prj NULL
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
-mkdir: %_DEST%\inc\cppuhelper
-
-..\inc\cppuhelper\implbase.hxx %_DEST%\inc\cppuhelper\implbase.hxx
-..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc\cppuhelper\implbase_ex.hxx
-..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc\cppuhelper\implbase_ex_pre.hxx
-..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc\cppuhelper\implbase_ex_post.hxx
-..\inc\cppuhelper\implbase1.hxx %_DEST%\inc\cppuhelper\implbase1.hxx
-..\inc\cppuhelper\implbase2.hxx %_DEST%\inc\cppuhelper\implbase2.hxx
-..\inc\cppuhelper\implbase3.hxx %_DEST%\inc\cppuhelper\implbase3.hxx
-..\inc\cppuhelper\implbase4.hxx %_DEST%\inc\cppuhelper\implbase4.hxx
-..\inc\cppuhelper\implbase5.hxx %_DEST%\inc\cppuhelper\implbase5.hxx
-..\inc\cppuhelper\implbase6.hxx %_DEST%\inc\cppuhelper\implbase6.hxx
-..\inc\cppuhelper\implbase7.hxx %_DEST%\inc\cppuhelper\implbase7.hxx
-..\inc\cppuhelper\implbase8.hxx %_DEST%\inc\cppuhelper\implbase8.hxx
-..\inc\cppuhelper\implbase9.hxx %_DEST%\inc\cppuhelper\implbase9.hxx
-..\inc\cppuhelper\implbase10.hxx %_DEST%\inc\cppuhelper\implbase10.hxx
-..\inc\cppuhelper\implbase11.hxx %_DEST%\inc\cppuhelper\implbase11.hxx
-..\inc\cppuhelper\implbase12.hxx %_DEST%\inc\cppuhelper\implbase12.hxx
-
-..\inc\cppuhelper\compbase.hxx %_DEST%\inc\cppuhelper\compbase.hxx
-..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc\cppuhelper\compbase_ex.hxx
-..\inc\cppuhelper\compbase1.hxx %_DEST%\inc\cppuhelper\compbase1.hxx
-..\inc\cppuhelper\compbase2.hxx %_DEST%\inc\cppuhelper\compbase2.hxx
-..\inc\cppuhelper\compbase3.hxx %_DEST%\inc\cppuhelper\compbase3.hxx
-..\inc\cppuhelper\compbase4.hxx %_DEST%\inc\cppuhelper\compbase4.hxx
-..\inc\cppuhelper\compbase5.hxx %_DEST%\inc\cppuhelper\compbase5.hxx
-..\inc\cppuhelper\compbase6.hxx %_DEST%\inc\cppuhelper\compbase6.hxx
-..\inc\cppuhelper\compbase7.hxx %_DEST%\inc\cppuhelper\compbase7.hxx
-..\inc\cppuhelper\compbase8.hxx %_DEST%\inc\cppuhelper\compbase8.hxx
-..\inc\cppuhelper\compbase9.hxx %_DEST%\inc\cppuhelper\compbase9.hxx
-..\inc\cppuhelper\compbase10.hxx %_DEST%\inc\cppuhelper\compbase10.hxx
-..\inc\cppuhelper\compbase11.hxx %_DEST%\inc\cppuhelper\compbase11.hxx
-..\inc\cppuhelper\compbase12.hxx %_DEST%\inc\cppuhelper\compbase12.hxx
-
-..\inc\cppuhelper\shlib.hxx %_DEST%\inc\cppuhelper\shlib.hxx
-..\inc\cppuhelper\basemutex.hxx %_DEST%\inc\cppuhelper\basemutex.hxx
-..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc\cppuhelper\exc_hlp.hxx
-..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc\cppuhelper\typeprovider.hxx
-..\inc\cppuhelper\factory.hxx %_DEST%\inc\cppuhelper\factory.hxx
-..\inc\cppuhelper\component_context.hxx %_DEST%\inc\cppuhelper\component_context.hxx
-..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc\cppuhelper\interfacecontainer.hxx
-..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc\cppuhelper\interfacecontainer.h
-..\inc\cppuhelper\component.hxx %_DEST%\inc\cppuhelper\component.hxx
-..\inc\cppuhelper\propshlp.hxx %_DEST%\inc\cppuhelper\propshlp.hxx
-..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc\cppuhelper\proptypehlp.hxx
-..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc\cppuhelper\propertysetmixin.hxx
-..\inc\cppuhelper\proptypehlp.h %_DEST%\inc\cppuhelper\proptypehlp.h
-..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc\cppuhelper\stdidlclass.hxx
-..\inc\cppuhelper\weak.hxx %_DEST%\inc\cppuhelper\weak.hxx
-..\inc\cppuhelper\weakagg.hxx %_DEST%\inc\cppuhelper\weakagg.hxx
-..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc\cppuhelper\queryinterface.hxx
-..\inc\cppuhelper\weakref.hxx %_DEST%\inc\cppuhelper\weakref.hxx
-..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc\cppuhelper\servicefactory.hxx
-..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc\cppuhelper\implementationentry.hxx
-..\inc\cppuhelper\access_control.hxx %_DEST%\inc\cppuhelper\access_control.hxx
-..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
-
-..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
-..\%__SRC%\bin\uno_cppuh*.dll %_DEST%\bin\uno_cppuh*.dll
-..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
-..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
-
-..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
-..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib\*
-
-..\source\unorc %_DEST%\bin\uno.ini
-..\source\unorc %_DEST%\lib\unorc
-
-..\inc\cppuhelper\findsofficepath.h %_DEST%\inc\cppuhelper\findsofficepath.h
-..\%__SRC%\obj\findsofficepath.o %_DEST%\lib\findsofficepath.o
-..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib\findsofficepath.obj
-
-linklib: libuno_cppuhelper*.*.*
--- a/cppuhelper/prj/makefile.mk
+++ b/cppuhelper/prj/makefile.mk
+.INCLUDE : gbuildbridge.mk
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=cppuhelper
-TARGET=cppu_ifcontainer
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
-.ENDIF
-
-SHL1OBJS=  \
-    $(SLO)$/cppu_ifcontainer.obj
-SHL1TARGET= cppu_ifcontainer
-SHL1STDLIBS=\
-    $(CPPUHELPERLIB) \
-    $(SALLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB)
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1USE_EXPORTS = name
-
-SLOFILES = $(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=cppuhelper
-TARGET=cppu_unourl
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET)
-.ENDIF
-
-SHL1OBJS=  \
-    $(SLO)$/cppu_unourl.obj
-SHL1TARGET= cppu_unourl
-SHL1STDLIBS=\
-    $(CPPUHELPERLIB) \
-    $(SALLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB)
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1USE_EXPORTS = name
-
-SLOFILES = $(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := cppuhelper
-TARGET := qa_weak
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN)
--- a/cppuhelper/qa/weak/version.map
+++ b/cppuhelper/qa/weak/version.map
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ b/cppuhelper/source/cc5_solaris_sparc.map
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
 UDK_3_0_0 {
    global:
-GetVersionInfo;
+    _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+
 _ZN3com3sun4star3uno19WeakReferenceHelperC1ERKNS2_9ReferenceINS2_10XInterfaceEEE;
 _ZN3com3sun4star3uno19WeakReferenceHelperC1ERKS3_;
 _ZN3com3sun4star3uno19WeakReferenceHelperC2ERKNS2_9ReferenceINS2_10XInterfaceEEE;
@@ -406,3 +407,9 @@ global:
        _ZN4cppu19OPropertySetHelper232enableChangeListenerNotificationEh;
        _ZThn*_N4cppu19OPropertySetHelper232enableChangeListenerNotificationEh;
 } UDK_3.7;
+
+# Unique libstdc++ symbols:
+GLIBCXX_3.4 {
+    global:
+    _ZGVNSt7num_put*; _ZNSt7num_put*;
+};
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=cppuhelper
-TARGET=cppuhelper
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# not strictly a bootstrap service but containing
-# bootstrap code that may require generated files
-# without "-L" (light) switch
-BOOTSTRAP_SERVICE=TRUE
-
-.IF "$(COM)" != "MSC"
-UNIXVERSIONNAMES=UDK
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRDEP=$(UNOUCRRDB)
-UNOUCROUT=$(OUT)$/inc$/$(TARGET)
-INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private
-
-CPPUMAKERFLAGS= -C
-
-UNOTYPES= \
-        com.sun.star.beans.PropertyAttribute \
-        com.sun.star.beans.PropertyValue \
-        com.sun.star.beans.XFastPropertySet \
-        com.sun.star.beans.XMultiPropertySet \
-        com.sun.star.beans.XPropertyAccess \
-        com.sun.star.beans.XPropertySet \
-        com.sun.star.beans.XPropertySetOption \
-        com.sun.star.bridge.UnoUrlResolver \
-        com.sun.star.bridge.XUnoUrlResolver \
-        com.sun.star.connection.SocketPermission \
-        com.sun.star.container.XElementAccess \
-        com.sun.star.container.XEnumerationAccess \
-        com.sun.star.container.XHierarchicalNameAccess \
-        com.sun.star.container.XNameAccess \
-        com.sun.star.container.XNameContainer \
-        com.sun.star.container.XSet \
-        com.sun.star.io.FilePermission \
-        com.sun.star.io.IOException \
-        com.sun.star.lang.DisposedException \
-        com.sun.star.lang.WrappedTargetRuntimeException \
-        com.sun.star.lang.XComponent \
-        com.sun.star.lang.XEventListener \
-        com.sun.star.lang.XInitialization \
-        com.sun.star.lang.XMultiComponentFactory \
-        com.sun.star.lang.XMultiServiceFactory \
-        com.sun.star.lang.XServiceInfo \
-        com.sun.star.lang.XSingleComponentFactory \
-        com.sun.star.lang.XSingleServiceFactory \
-        com.sun.star.lang.XTypeProvider \
-        com.sun.star.loader.XImplementationLoader \
-        com.sun.star.reflection.XArrayTypeDescription \
-        com.sun.star.reflection.XCompoundTypeDescription \
-        com.sun.star.reflection.XEnumTypeDescription \
-        com.sun.star.reflection.XIdlClass \
-        com.sun.star.reflection.XIdlField2 \
-        com.sun.star.reflection.XIdlReflection \
-        com.sun.star.reflection.XIndirectTypeDescription \
-        com.sun.star.reflection.XInterfaceAttributeTypeDescription \
-        com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
-        com.sun.star.reflection.XInterfaceMemberTypeDescription \
-        com.sun.star.reflection.XInterfaceMethodTypeDescription \
-        com.sun.star.reflection.XInterfaceTypeDescription2 \
-        com.sun.star.reflection.XMethodParameter \
-        com.sun.star.reflection.XStructTypeDescription \
-        com.sun.star.reflection.XTypeDescription \
-        com.sun.star.reflection.XUnionTypeDescription \
-        com.sun.star.registry.XImplementationRegistration \
-        com.sun.star.registry.XRegistryKey \
-        com.sun.star.registry.XSimpleRegistry \
-        com.sun.star.security.RuntimePermission \
-        com.sun.star.security.XAccessController \
-        com.sun.star.uno.DeploymentException \
-        com.sun.star.uno.RuntimeException \
-        com.sun.star.uno.XAggregation \
-        com.sun.star.uno.XComponentContext \
-        com.sun.star.uno.XCurrentContext \
-        com.sun.star.uno.XUnloadingPreference \
-        com.sun.star.uno.XWeak \
-        com.sun.star.util.XMacroExpander
-
-.IF "$(debug)" != ""
-# msvc++: no inlining for debugging
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-.ENDIF
-
-SLOFILES= \
-        $(SLO)$/typeprovider.obj 	\
-        $(SLO)$/exc_thrower.obj 	\
-        $(SLO)$/servicefactory.obj 	\
-        $(SLO)$/bootstrap.obj 		\
-        $(SLO)$/implbase.obj 		\
-        $(SLO)$/implbase_ex.obj 	\
-        $(SLO)$/propshlp.obj 		\
-        $(SLO)$/weak.obj		\
-        $(SLO)$/interfacecontainer.obj	\
-        $(SLO)$/stdidlclass.obj 	\
-        $(SLO)$/factory.obj		\
-        $(SLO)$/component_context.obj	\
-        $(SLO)$/component.obj		\
-        $(SLO)$/shlib.obj		\
-        $(SLO)$/tdmgr.obj		\
-        $(SLO)$/implementationentry.obj	\
-        $(SLO)$/access_control.obj	\
-        $(SLO)$/macro_expander.obj \
-            $(SLO)$/unourl.obj \
-        $(SLO)$/propertysetmixin.obj \
-        $(SLO)$/findsofficepath.obj
-
-OBJFILES = $(OBJ)$/findsofficepath.obj
-
-.IF "$(COM)" == "MSC"
-SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
-.ELSE
-SHL1TARGET=uno_$(TARGET)$(COMID)
-.ENDIF
-
-SHL1STDLIBS= \
-        $(SALLIB)		\
-        $(SALHELPERLIB)	\
-        $(CPPULIB)
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF
-
-SHL1DEPN=
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=uno_$(TARGET)$(COMID)
-.ENDIF
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH=URELIB
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-
-.IF "$(COMNAME)"=="msci"
-SHL1VERSIONMAP=msvc_win32_intel.map
-.ELIF "$(COMNAME)"=="mscx"
-SHL1VERSIONMAP=msvc_win32_x86_64.map
-.ELIF "$(COMNAME)"=="sunpro5"
-SHL1VERSIONMAP=cc5_solaris_sparc.map
-.ELIF "$(COMNAME)"=="gcc3"
-SHL1VERSIONMAP=gcc3.map
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(diag)"!=""
-CFLAGS += -DDIAG=$(diag)
-.ENDIF
-
-.INCLUDE :	target.mk
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
--- a/cppuhelper/source/msvc_win32_x86_64.map
+++ b/cppuhelper/source/msvc_win32_x86_64.map
--- a/cppuhelper/unotypes/Makefile
+++ b/cppuhelper/unotypes/Makefile
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+gb_PARTIALBUILD:=T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+all: private_types.flag unotypes.flag
+
+# private_types
+private_types.flag: private_types.rdb
+	$(call gb_Helper_abbreviate_dirs_native, \
+	    $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< \
+			-Tcppuhelper.detail.XExceptionThrower \
+			-X$(OUTDIR_FOR_BUILD)/bin/types.rdb)
+	touch $@
+
+private_types.rdb: XExceptionThrower.urd
+	$(call gb_Helper_abbreviate_dirs_native, \
+	    $(call gb_Helper_execute,regmerge) $@ /UCR $< \
+			$(OUTDIR_FOR_BUILD)/bin/types.rdb)
+
+XExceptionThrower.urd: $(SRCDIR)/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,idlc) -I. -I$(OUTDIR_FOR_BUILD)/idl -O. $<)
+
+# unotypes
+unotypes.flag:
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,cppumaker) -O. -BUCR -C \
+			$(foreach type,$(UNOTYPES),-T$(type)) $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
+
+UNOTYPES := \
+	com.sun.star.beans.PropertyAttribute \
+	com.sun.star.beans.PropertyValue \
+	com.sun.star.beans.XFastPropertySet \
+	com.sun.star.beans.XMultiPropertySet \
+	com.sun.star.beans.XPropertyAccess \
+	com.sun.star.beans.XPropertySet \
+	com.sun.star.beans.XPropertySetOption \
+	com.sun.star.bridge.UnoUrlResolver \
+	com.sun.star.bridge.XUnoUrlResolver \
+	com.sun.star.connection.SocketPermission \
+	com.sun.star.container.XElementAccess \
+	com.sun.star.container.XEnumerationAccess \
+	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.container.XNameAccess \
+	com.sun.star.container.XNameContainer \
+	com.sun.star.container.XSet \
+	com.sun.star.io.FilePermission \
+	com.sun.star.io.IOException \
+	com.sun.star.lang.DisposedException \
+	com.sun.star.lang.WrappedTargetRuntimeException \
+	com.sun.star.lang.XComponent \
+	com.sun.star.lang.XEventListener \
+	com.sun.star.lang.XInitialization \
+	com.sun.star.lang.XMultiComponentFactory \
+	com.sun.star.lang.XMultiServiceFactory \
+	com.sun.star.lang.XServiceInfo \
+	com.sun.star.lang.XSingleComponentFactory \
+	com.sun.star.lang.XSingleServiceFactory \
+	com.sun.star.lang.XTypeProvider \
+	com.sun.star.loader.XImplementationLoader \
+	com.sun.star.reflection.XArrayTypeDescription \
+	com.sun.star.reflection.XCompoundTypeDescription \
+	com.sun.star.reflection.XEnumTypeDescription \
+	com.sun.star.reflection.XIdlClass \
+	com.sun.star.reflection.XIdlField2 \
+	com.sun.star.reflection.XIdlReflection \
+	com.sun.star.reflection.XIndirectTypeDescription \
+	com.sun.star.reflection.XInterfaceAttributeTypeDescription \
+	com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
+	com.sun.star.reflection.XInterfaceMemberTypeDescription \
+	com.sun.star.reflection.XInterfaceMethodTypeDescription \
+	com.sun.star.reflection.XInterfaceTypeDescription2 \
+	com.sun.star.reflection.XMethodParameter \
+	com.sun.star.reflection.XStructTypeDescription \
+	com.sun.star.reflection.XTypeDescription \
+	com.sun.star.reflection.XUnionTypeDescription \
+	com.sun.star.registry.XImplementationRegistration \
+	com.sun.star.registry.XRegistryKey \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.security.RuntimePermission \
+	com.sun.star.security.XAccessController \
+	com.sun.star.uno.DeploymentException \
+	com.sun.star.uno.RuntimeException \
+	com.sun.star.uno.XAggregation \
+	com.sun.star.uno.XComponentContext \
+	com.sun.star.uno.XCurrentContext \
+	com.sun.star.uno.XUnloadingPreference \
+	com.sun.star.uno.XWeak \
+	com.sun.star.util.XMacroExpander
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+# vim: set noet sw=4 ts=4:
--- a/cppuhelper/unotypes/makefile.mk
+++ b/cppuhelper/unotypes/makefile.mk
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# 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.
-#
-# 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).
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..
-
-PRJNAME = cppuhelper
-TARGET = private_types
-
-.INCLUDE :  settings.mk
-
-UNOUCRRDB = $(BIN)$/$(TARGET).rdb
-UNOUCRDEP = $(UNOUCRRDB)
-UNOUCROUT = $(OUT)$/inc$/private
-
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
-
-UNOTYPES = \
-    cppuhelper.detail.XExceptionThrower
-
-ALLIDLFILES = \
-    .$/cppuhelper$/detail$/XExceptionThrower.idl
-
-.INCLUDE : target.mk
-
-$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
-    $(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
-    $(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
-    touch $@