cppu: convert to gbuild

Because of unit tests is here custom target where are idl files
processed.

40 files changed, 730 insertions, 983 deletions

diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
new file mode 100644
index 000000000000..5b3440e40ea7
--- /dev/null
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_qa_any))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \
+	cppu/qa/test_any \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_any, \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,cppu_qa_any,\
+	-I$(WORKDIR)/CustomTarget/cppu/qa \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
new file mode 100644
index 000000000000..5bc071c078b7
--- /dev/null
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_qa_recursion))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
+	cppu/qa/test_recursion \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_recursion, \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,cppu_qa_recursion,\
+	-I$(WORKDIR)/CustomTarget/cppu/qa \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
new file mode 100644
index 000000000000..6d9eabcdb7fd
--- /dev/null
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_qa_reference))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
+	cppu/qa/test_reference \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_reference, \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,cppu_qa_reference,\
+	-I$(WORKDIR)/CustomTarget/cppu/qa \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
new file mode 100644
index 000000000000..c568eb413038
--- /dev/null
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_qa_unotype))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
+	cppu/qa/test_unotype \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_unotype, \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,cppu_qa_unotype,\
+	-I$(WORKDIR)/CustomTarget/cppu/qa \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
new file mode 100644
index 000000000000..0b7c4f14dbcb
--- /dev/null
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; 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.
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppu_test_cppumaker))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \
+	cppu/qa/cppumaker/test_cppumaker \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,cppu_test_cppumaker, \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,cppu_test_cppumaker,\
+	-I$(WORKDIR)/CustomTarget/cppu/qa \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+	$$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
new file mode 100644
index 000000000000..b5e30beaa32a
--- /dev/null
+++ b/cppu/Library_affine_uno.mk
@@ -0,0 +1,50 @@
+# -*- 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.
+
+$(eval $(call gb_Library_Library,affine_uno))
+
+$(eval $(call gb_Library_set_include,affine_uno,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+))
+
+$(eval $(call gb_Library_add_api,affine_uno,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,affine_uno,\
+	purpenvhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,affine_uno,\
+	cppu/source/AffineBridge/AffineBridge \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
new file mode 100644
index 000000000000..6115bb244b22
--- /dev/null
+++ b/cppu/Library_cppu.mk
@@ -0,0 +1,75 @@
+# -*- 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.
+
+$(eval $(call gb_Library_Library,cppu))
+
+$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
+
+# Unit tests depend on cppu_generated custom target
+$(eval $(call gb_Library_add_package_headers,cppu,cppu_generated))
+
+$(eval $(call gb_Library_set_include,cppu,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+))
+
+$(eval $(call gb_Library_add_api,cppu,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppu,\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,cppu,\
+	cppu/source/uno/EnvDcp \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppu,\
+	cppu/source/cppu/cppu_opt \
+	cppu/source/threadpool/current \
+	cppu/source/threadpool/jobqueue \
+	cppu/source/threadpool/thread \
+	cppu/source/threadpool/threadident \
+	cppu/source/threadpool/threadpool \
+	cppu/source/typelib/static_types \
+	cppu/source/typelib/typelib \
+	cppu/source/uno/any \
+	cppu/source/uno/cascade_mapping \
+	cppu/source/uno/data \
+	cppu/source/uno/EnvStack \
+	cppu/source/uno/env_subst \
+	cppu/source/uno/IdentityMapping \
+	cppu/source/uno/lbenv \
+	cppu/source/uno/lbmap \
+	cppu/source/uno/loadmodule \
+	cppu/source/uno/sequence \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
new file mode 100644
index 000000000000..5bdf72f88831
--- /dev/null
+++ b/cppu/Library_log_uno.mk
@@ -0,0 +1,51 @@
+# -*- 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.
+
+$(eval $(call gb_Library_Library,log_uno))
+
+$(eval $(call gb_Library_set_include,log_uno,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+))
+
+$(eval $(call gb_Library_add_api,log_uno,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,log_uno,\
+	cppu \
+	purpenvhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,log_uno,\
+	cppu/source/LogBridge/LogBridge \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
new file mode 100644
index 000000000000..5e71e6da9f67
--- /dev/null
+++ b/cppu/Library_purpenvhelper.mk
@@ -0,0 +1,54 @@
+# -*- 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.
+
+$(eval $(call gb_Library_Library,purpenvhelper))
+
+$(eval $(call gb_Library_set_soversion_script,purpenvhelper,3,$(SRCDIR)/cppu/util/uno_purpenvhelpergcc3.map))
+
+$(eval $(call gb_Library_set_include,purpenvhelper,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+))
+
+$(eval $(call gb_Library_add_api,purpenvhelper,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,purpenvhelper,\
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,purpenvhelper,\
+	cppu/source/helper/purpenv/helper_purpenv_Environment \
+	cppu/source/helper/purpenv/helper_purpenv_Mapping \
+	cppu/source/helper/purpenv/helper_purpenv_Proxy \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
new file mode 100644
index 000000000000..4f6b0bf97092
--- /dev/null
+++ b/cppu/Library_unsafe_uno.mk
@@ -0,0 +1,50 @@
+# -*- 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.
+
+$(eval $(call gb_Library_Library,unsafe_uno))
+
+$(eval $(call gb_Library_set_include,unsafe_uno,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/cppu/inc) \
+))
+
+$(eval $(call gb_Library_add_api,unsafe_uno,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,unsafe_uno,\
+	purpenvhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,unsafe_uno,\
+	cppu/source/UnsafeBridge/UnsafeBridge \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/inc/makefile.mk b/cppu/Makefile
index e8f3eba9fb1a..2289c8303bf8 100644
--- a/cppu/inc/makefile.mk
+++ b/cppu/Makefile
@@ -1,8 +1,9 @@
+# -*- 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,17 +25,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=cppu
-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
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(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:
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
new file mode 100644
index 000000000000..e4e12d09ba31
--- /dev/null
+++ b/cppu/Module_cppu.mk
@@ -0,0 +1,48 @@
+# -*- 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.
+
+$(eval $(call gb_Module_Module,cppu))
+
+$(eval $(call gb_Module_add_targets,cppu,\
+	Library_affine_uno \
+	Library_cppu \
+	Library_log_uno \
+	Library_purpenvhelper \
+	Library_unsafe_uno \
+	Package_generated \
+	Package_inc \
+))
+
+$(eval $(call gb_Module_add_check_targets,cppu,\
+	CppunitTest_cppu_qa_any \
+	CppunitTest_cppu_qa_recursion \
+	CppunitTest_cppu_qa_reference \
+	CppunitTest_cppu_qa_unotype \
+	CppunitTest_cppu_test_cppumaker \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Package_generated.mk b/cppu/Package_generated.mk
new file mode 100644
index 000000000000..027219258a5f
--- /dev/null
+++ b/cppu/Package_generated.mk
@@ -0,0 +1,39 @@
+# -*- 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,cppu_generated))
+
+$(eval $(call gb_Package_add_customtarget,cppu_generated,cppu/qa))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppu/qa,\
+	$(gb_UnoApiTarget_CPPUMAKERTARGET) \
+	$(gb_UnoApiTarget_IDLCTARGET) \
+	$(gb_UnoApiTarget_REGMERGETARGET) \
+	$(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/Package_inc.mk b/cppu/Package_inc.mk
new file mode 100644
index 000000000000..e1b76db2af5c
--- /dev/null
+++ b/cppu/Package_inc.mk
@@ -0,0 +1,71 @@
+# -*- 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.
+
+$(eval $(call gb_Package_Package,cppu_inc,$(SRCDIR)/cppu/inc))
+
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Any.h,com/sun/star/uno/Any.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Any.hxx,com/sun/star/uno/Any.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/genfunc.h,com/sun/star/uno/genfunc.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/genfunc.hxx,com/sun/star/uno/genfunc.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Reference.h,com/sun/star/uno/Reference.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Reference.hxx,com/sun/star/uno/Reference.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.h,com/sun/star/uno/Sequence.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Sequence.hxx,com/sun/star/uno/Sequence.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.h,com/sun/star/uno/Type.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/com/sun/star/uno/Type.hxx,com/sun/star/uno/Type.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvDcp.hxx,cppu/EnvDcp.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Enterable.hxx,cppu/Enterable.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvGuards.hxx,cppu/EnvGuards.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/FreeReference.hxx,cppu/FreeReference.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/macros.hxx,cppu/macros.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Map.hxx,cppu/Map.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Shield.hxx,cppu/Shield.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/unotype.hxx,cppu/unotype.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Environment.hxx,cppu/helper/purpenv/Environment.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Mapping.hxx,cppu/helper/purpenv/Mapping.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typeclass.h,typelib/typeclass.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.h,typelib/typedescription.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.hxx,typelib/typedescription.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/uik.h,typelib/uik.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/any2.h,uno/any2.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/cuno.h,uno/cuno.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.h,uno/current_context.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.hxx,uno/current_context.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/data.h,uno/data.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/dispatcher.h,uno/dispatcher.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/dispatcher.hxx,uno/dispatcher.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/Enterable.h,uno/Enterable.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/EnvDcp.h,uno/EnvDcp.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/environment.h,uno/environment.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/environment.hxx,uno/environment.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/lbnames.h,uno/lbnames.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/mapping.h,uno/mapping.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/mapping.hxx,uno/mapping.hxx))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/sequence2.h,uno/sequence2.h))
+$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/threadpool.h,uno/threadpool.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index f55bffde8ce1..542a56b67c62 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -1,14 +1,2 @@
 cu	cppu	:	sal salhelper offapi BOOST:boost NULL
-cu	cppu							usr1	-	all	cu_mkout NULL
-cu	cppu\inc						nmake	-	all	cu_inc NULL
-cu	cppu\source\uno					nmake	-	all	cu_uno cu_inc NULL
-cu	cppu\source\threadpool			nmake	-	all	cu_thpool cu_inc NULL
-cu	cppu\source\typelib				nmake	-	all	cu_typelib cu_inc NULL
-cu	cppu\source\cppu				nmake	-	all	cu_cppu cu_inc NULL
-cu	cppu\source\helper\purpenv		nmake	-	all	cu_helper_purpenv cu_inc NULL
-cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
-cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
-cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
-cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
-cu	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
-cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_util NULL
+cu	cppu\prj						nmake	-	all	cu_prj NULL
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 0ee434b54239..e69de29bb2d1 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -1,76 +0,0 @@
-mkdir: %_DEST%\inc\cppu
-mkdir: %_DEST%\inc\cppu\helper\purpenv
-mkdir: %_DEST%\inc\com
-mkdir: %_DEST%\inc\com\sun
-mkdir: %_DEST%\inc\com\sun\star
-mkdir: %_DEST%\inc\com\sun\star\uno
-mkdir: %_DEST%\inc\typelib
-mkdir: %_DEST%\inc\uno
-
-..\inc\cppu\macros.hxx %_DEST%\inc\cppu\macros.hxx
-..\inc\cppu\unotype.hxx %_DEST%\inc\cppu\unotype.hxx
-
-..\inc\com\sun\star\uno\Reference.h %_DEST%\inc\com\sun\star\uno\Reference.h
-..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc\com\sun\star\uno\Reference.hxx
-..\inc\com\sun\star\uno\Type.h %_DEST%\inc\com\sun\star\uno\Type.h
-..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc\com\sun\star\uno\Type.hxx
-..\inc\com\sun\star\uno\Any.h %_DEST%\inc\com\sun\star\uno\Any.h
-..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc\com\sun\star\uno\Any.hxx
-..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc\com\sun\star\uno\Sequence.h
-..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc\com\sun\star\uno\Sequence.hxx
-..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc\com\sun\star\uno\genfunc.h
-..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc\com\sun\star\uno\genfunc.hxx
-
-..\inc\typelib\typeclass.h %_DEST%\inc\typelib\typeclass.h
-..\inc\typelib\typedescription.h %_DEST%\inc\typelib\typedescription.h
-..\inc\typelib\typedescription.hxx %_DEST%\inc\typelib\typedescription.hxx
-..\inc\typelib\uik.h %_DEST%\inc\typelib\uik.h
-
-..\inc\uno\dispatcher.h %_DEST%\inc\uno\dispatcher.h
-..\inc\uno\dispatcher.hxx %_DEST%\inc\uno\dispatcher.hxx
-..\inc\uno\any2.h %_DEST%\inc\uno\any2.h
-..\inc\uno\sequence2.h %_DEST%\inc\uno\sequence2.h
-..\inc\uno\data.h %_DEST%\inc\uno\data.h
-..\inc\uno\lbnames.h %_DEST%\inc\uno\lbnames.h
-..\inc\uno\environment.h %_DEST%\inc\uno\environment.h
-..\inc\uno\environment.hxx %_DEST%\inc\uno\environment.hxx
-..\inc\uno\mapping.h %_DEST%\inc\uno\mapping.h
-..\inc\uno\mapping.hxx %_DEST%\inc\uno\mapping.hxx
-..\inc\uno\threadpool.h %_DEST%\inc\uno\threadpool.h
-..\inc\uno\current_context.h %_DEST%\inc\uno\current_context.h
-..\inc\uno\current_context.hxx %_DEST%\inc\uno\current_context.hxx
-..\inc\uno\cuno.h %_DEST%\inc\uno\cuno.h
-..\inc\uno\EnvDcp.h              %_DEST%\inc\uno\EnvDcp.h
-..\inc\uno\Enterable.h           %_DEST%\inc\uno\Enterable.h
-
-..\inc\cppu\EnvDcp.hxx           %_DEST%\inc\cppu\EnvDcp.hxx
-..\inc\cppu\Enterable.hxx        %_DEST%\inc\cppu\Enterable.hxx
-..\inc\cppu\EnvGuards.hxx        %_DEST%\inc\cppu\EnvGuards.hxx
-..\inc\cppu\FreeReference.hxx    %_DEST%\inc\cppu\FreeReference.hxx
-..\inc\cppu\Map.hxx              %_DEST%\inc\cppu\Map.hxx
-..\inc\cppu\Shield.hxx           %_DEST%\inc\cppu\Shield.hxx
-
-..\inc\cppu\helper\purpenv\Environment.hxx  %_DEST%\inc\cppu\helper\purpenv\Environment.hxx
-..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc\cppu\helper\purpenv\Mapping.hxx
-
-..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
-..\%__SRC%\bin\cppu* %_DEST%\bin\*
-..\%__SRC%\bin\uno_cppu* %_DEST%\bin\*
-..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
-
-..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib\*
-..\%__SRC%\bin\purpe*.dll     %_DEST%\bin\*
-..\%__SRC%\bin\uno_purpe*.dll     %_DEST%\bin\*
-..\%__SRC%\lib\libuno_purpenvhelper*.* %_DEST%\lib\*
-
-..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin\*
-..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib\*
-
-..\%__SRC%\bin\affine_u*.dll   %_DEST%\bin\*
-..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib\*
-
-..\%__SRC%\bin\log_u*.dll   %_DEST%\bin\*
-..\%__SRC%\lib\liblog_uno_uno.*   %_DEST%\lib\*
-
-linklib: libuno_cppu.*.*
-linklib: libuno_purpenvhelper*.*.*
diff --git a/cppu/prj/makefile.mk b/cppu/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/cppu/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/cppu/qa/Makefile b/cppu/qa/Makefile
new file mode 100644
index 000000000000..99a7eec22be3
--- /dev/null
+++ b/cppu/qa/Makefile
@@ -0,0 +1,48 @@
+# -*- 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.
+
+gb_PARTIALBUILD:=T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+all: qa/cppumaker.flag qa/cppumaker/cppumaker.flag
+
+%/cppumaker.flag: %/cppumaker.rdb
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
+	touch $@
+
+%/cppumaker.rdb: %/types.urd
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,regmerge) $@ /UCR $<)
+
+%/types.urd: $(SRCDIR)/cppu/%/types.idl
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(call gb_Helper_execute,idlc) -O$* -I$(OUTDIR_FOR_BUILD)/idl -cid -we $<)
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
deleted file mode 100644
index e8f7d7dd4401..000000000000
--- a/cppu/qa/cppumaker/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET := test_cppumaker
-
-ENABLE_EXCEPTIONS := TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.INCLUDE: settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-	@echo Nothing done when cross-compiling
-.ENDIF
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-DLLPRE = # no leading "lib" on .so files
-
-INCPRE += $(MISC)/$(TARGET)/inc
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)/test_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1USE_EXPORTS = name
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-.IF "$(depend)" == ""
-ALLTAR: test
-.END
-
-$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag
-
-$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb
-	- $(MKDIRHIER) $(MISC)/$(TARGET)/inc
-	$(CPPUMAKER) \
-	    -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb
-	$(TOUCH) $@
-
-$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd
-	- rm -f $@
-	$(REGMERGE) $@ /UCR $<
-
-$(MISC)/$(TARGET)/types.urd: types.idl
-	- $(MKDIR) $(MISC)/$(TARGET)
-	$(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-
-test .PHONY: $(SHL1TARGETN)
-	$(CPPUNITTESTER) $<
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
deleted file mode 100644
index d67184605a20..000000000000
--- a/cppu/qa/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET := qa
-
-ENABLE_EXCEPTIONS := TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX+=$(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += $(OBJCXXFLAGS)
-.ENDIF
-
-DLLPRE=# no leading "lib" on .so files
-
-INCPRE+=$(MISC)$/$(TARGET)$/inc
-
-SHL1TARGET = $(TARGET)_any
-SHL1OBJS = $(SLO)$/test_any.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1USE_EXPORTS = name
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SHL2TARGET = $(TARGET)_unotype
-SHL2OBJS = $(SLO)$/test_unotype.obj
-SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL2USE_EXPORTS = name
-SHL2IMPLIB = i$(SHL2TARGET)
-DEF2NAME = $(SHL2TARGET)
-
-SHL3TARGET = $(TARGET)_reference
-SHL3OBJS = $(SLO)$/test_reference.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL3USE_EXPORTS = name
-SHL3IMPLIB = i$(SHL3TARGET)
-DEF3NAME = $(SHL3TARGET)
-
-SHL4TARGET = $(TARGET)_recursion
-SHL4OBJS = $(SLO)$/test_recursion.obj
-SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL4USE_EXPORTS = name
-SHL4IMPLIB = i$(SHL4TARGET)
-DEF4NAME = $(SHL4TARGET)
-
-SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
-
-.IF "$(OS)" == "IOS no thanks for now" 
-# Nah, we can't build this here for iOS after all, thanks to having to
-# use static linking, we would need to link with -lgcc3_uno from
-# bridges which has not been built yet (and which in fact depends on
-# cppu...) Seems that any meaningful unit test for iOS actually needs
-# to be built in the "subsequent" stage.
-APP5OBJS = $(OBJ)/cppu_cppunittester_all.obj $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
-APP5RPATH = NONE
-APP5STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB)
-APP5TARGET = cppu_cppunittester_all
-.ENDIF
-
-.INCLUDE: target.mk
-
-$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
-
-$(SHL2OBJS): $(MISC)$/$(TARGET).cppumaker.flag
-
-$(SHL3OBJS): $(MISC)$/$(TARGET).cppumaker.flag
-
-$(SHL4OBJS): $(MISC)$/$(TARGET).cppumaker.flag
-
-$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
-    - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
-    $(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< \
-        $(SOLARBINDIR)$/udkapi.rdb
-    $(TOUCH) $@
-
-$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
-    - $(RM) $@
-    $(REGMERGE) $@ /UCR $<
-
-$(MISC)$/$(TARGET)$/types.urd: types.idl
-    - $(MKDIR) $(MISC)$/$(TARGET)
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-
-.INCLUDE : _cppunit.mk
diff --git a/cppu/source/AffineBridge/makefile.mk b/cppu/source/AffineBridge/makefile.mk
deleted file mode 100644
index 278952118eda..000000000000
--- a/cppu/source/AffineBridge/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET  := AffineBridge
-
-ENABLE_EXCEPTIONS  := TRUE
-USE_DEFFILE        := FALSE
-
-
-.INCLUDE: settings.mk
-
-
-SLOFILES := $(SLO)$/AffineBridge.obj
-
-
-.INCLUDE: target.mk
-
diff --git a/cppu/source/LogBridge/makefile.mk b/cppu/source/LogBridge/makefile.mk
deleted file mode 100644
index 7c460b238b2d..000000000000
--- a/cppu/source/LogBridge/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET  := LogBridge
-
-ENABLE_EXCEPTIONS  := TRUE
-USE_DEFFILE        := FALSE
-
-
-.INCLUDE: settings.mk
-
-
-SLOFILES := $(SLO)$/LogBridge.obj
-
-
-.INCLUDE: target.mk
-
diff --git a/cppu/source/UnsafeBridge/makefile.mk b/cppu/source/UnsafeBridge/makefile.mk
deleted file mode 100644
index 4ea9f453b632..000000000000
--- a/cppu/source/UnsafeBridge/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET  := UnsafeBridge
-
-ENABLE_EXCEPTIONS  := TRUE
-USE_DEFFILE        := FALSE
-
-
-.INCLUDE: settings.mk
-
-
-SLOFILES := $(SLO)$/UnsafeBridge.obj
-
-
-.INCLUDE: target.mk
-
diff --git a/cppu/source/cppu/makefile.mk b/cppu/source/cppu/makefile.mk
deleted file mode 100644
index 5a42ec3113c2..000000000000
--- a/cppu/source/cppu/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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=cppu
-TARGET=cppu_cppu
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  ..$/..$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/cppu_opt.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :      ..$/..$/util$/target.pmk
-.INCLUDE :	target.mk
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
deleted file mode 100644
index 6ffea2e6a576..000000000000
--- a/cppu/source/helper/purpenv/export.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-.IF "$(COM)"=="GCC"
-NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
-purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
-.ELSE
-NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)
-purpenv_helper_LIB := $(LIBPRE) i$(NAMEpurpenv_helper).lib
-.ENDIF
diff --git a/cppu/source/helper/purpenv/makefile.mk b/cppu/source/helper/purpenv/makefile.mk
deleted file mode 100644
index b68788484430..000000000000
--- a/cppu/source/helper/purpenv/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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 := cppu
-TARGET  := helper_purpenv
-
-
-ENABLE_EXCEPTIONS  := TRUE
-USE_DEFFILE        := TRUE
-
-
-.INCLUDE :  settings.mk
-
-SLOFILES := \
-    $(SLO)$/helper_purpenv_Environment.obj             \
-    $(SLO)$/helper_purpenv_Mapping.obj         \
-    $(SLO)$/helper_purpenv_Proxy.obj
-
-
-.INCLUDE :  target.mk
diff --git a/cppu/source/threadpool/makefile.mk b/cppu/source/threadpool/makefile.mk
deleted file mode 100644
index ea5e146b9cf6..000000000000
--- a/cppu/source/threadpool/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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=cppu
-TARGET=cppu_threadpool
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  ..$/..$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/threadpool.obj\
-    $(SLO)$/jobqueue.obj\
-    $(SLO)$/thread.obj\
-    $(SLO)$/threadident.obj\
-    $(SLO)$/current.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :      ..$/..$/util$/target.pmk
-.INCLUDE :	target.mk
diff --git a/cppu/source/typelib/makefile.mk b/cppu/source/typelib/makefile.mk
deleted file mode 100644
index 5a09459fed54..000000000000
--- a/cppu/source/typelib/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# 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=cppu
-TARGET=cppu_typelib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  ..$/..$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/typelib.obj		\
-    $(SLO)$/static_types.obj
-
-.INCLUDE :      ..$/..$/util$/target.pmk
-.INCLUDE :	target.mk
-
diff --git a/cppu/source/uno/makefile.mk b/cppu/source/uno/makefile.mk
deleted file mode 100644
index 63bf4f0387ac..000000000000
--- a/cppu/source/uno/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# 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=cppu
-TARGET=cppu_uno
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  ..$/..$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/data.obj     \
-    $(SLO)$/sequence.obj \
-    $(SLO)$/any.obj      \
-    $(SLO)$/lbmap.obj    \
-    $(SLO)$/lbenv.obj    \
-    $(SLO)$/IdentityMapping.obj \
-    $(SLO)$/EnvDcp.obj \
-    $(SLO)$/cascade_mapping.obj \
-    $(SLO)$/EnvStack.obj \
-    $(SLO)$/env_subst.obj \
-        $(SLO)$/loadmodule.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :      ..$/..$/util$/target.pmk
-.INCLUDE :	target.mk
diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map
index e89594615f53..e89594615f53 100755..100644
--- a/cppu/util/cppu.map
+++ b/cppu/util/cppu.map
diff --git a/cppu/util/empty.def b/cppu/util/empty.def
deleted file mode 100644
index 269c8f14cffd..000000000000
--- a/cppu/util/empty.def
+++ /dev/null
@@ -1,6 +0,0 @@
-HEAPSIZE	  0
-EXPORTS
-
-
-
-
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
deleted file mode 100644
index e70ba1ae519b..000000000000
--- a/cppu/util/extra.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# 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          :=cppu
-TARGET           :=cppu
-ENABLE_EXCEPTIONS:=TRUE
-USE_DEFFILE      :=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : ../source/helper/purpenv/export.mk
-
-# --- Files --------------------------------------------------------
-
-SHL3TARGET  := unsafe_uno_uno
-.IF "$(COM)" == "MSC"
-SHL3IMPLIB  := i$(SHL3TARGET)
-.ELSE
-SHL3IMPLIB  := $(SHL3TARGET)
-.ENDIF
-SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
-SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
-SHL3DEF     := empty.def
-SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
-SHL3RPATH   := URELIB
-
-SHL4TARGET  := affine_uno_uno
-.IF "$(COM)" == "MSC"
-SHL4IMPLIB  := i$(SHL4TARGET)
-.ELSE
-SHL4IMPLIB  := $(SHL4TARGET)
-.ENDIF
-SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
-SHL4OBJS    := $(SLO)$/AffineBridge.obj
-SHL4DEF     := empty.def
-SHL4OBJS    := $(SLO)$/AffineBridge.obj
-SHL4RPATH   := URELIB
-
-SHL5TARGET  := log_uno_uno
-.IF "$(COM)" == "MSC"
-SHL5IMPLIB  := i$(SHL5TARGET)
-.ELSE
-SHL5IMPLIB  := $(SHL5TARGET)
-.ENDIF
-SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
-SHL5OBJS    := $(SLO)$/LogBridge.obj
-
-SHL5DEF     := empty.def
-SHL5RPATH   := URELIB
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
deleted file mode 100644
index 631041715a09..000000000000
--- a/cppu/util/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#*************************************************************************
-#
-# 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=cppu
-TARGET=cppu
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-.IF "$(COM)" != "MSC"
-UNIXVERSIONNAMES=UDK
-.ENDIF
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : ../source/helper/purpenv/export.mk
-
-# --- Files --------------------------------------------------------
-
-SHL1LIBS= \
-    $(SLB)$/cppu_typelib.lib	\
-    $(SLB)$/cppu_uno.lib		\
-    $(SLB)$/cppu_threadpool.lib	\
-    $(SLB)$/cppu_cppu.lib
-
-.IF "$(COM)" == "MSC"
-SHL1TARGET=$(TARGET)$(UDK_MAJOR)
-.ELSE
-SHL1TARGET= uno_$(TARGET)
-.ENDIF
-
-SHL1STDLIBS = $(SALLIB)
-
-SHL1DEPN=
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=uno_$(TARGET)
-.ENDIF
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-.ENDIF
-
-SHL1VERSIONMAP=$(TARGET).map
-SHL1RPATH=URELIB
-
-DEF1NAME=$(SHL1TARGET)
-
-
-SHL2TARGET  := $(NAMEpurpenv_helper)
-DEF2NAME    := $(SHL2TARGET)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
-.ELIF "$(COMNAME)"=="mscx"
-SHL2VERSIONMAP:=$(SHL2TARGET)X.map
-.ELSE
-SHL2VERSIONMAP:=$(SHL2TARGET).map
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-SHL2DEF     := $(MISC)$/$(SHL2TARGET).def
-.IF "$(COM)" == "MSC"
-SHL2IMPLIB  := i$(SHL2TARGET)
-.ELSE
-SHL2IMPLIB  := $(SHL2TARGET)
-.ENDIF
-SHL2STDLIBS := $(CPPULIB) $(SALLIB)
-SHL2RPATH   := URELIB
-SHL2OBJS    := \
-    $(SLO)$/helper_purpenv_Environment.obj 	\
-    $(SLO)$/helper_purpenv_Mapping.obj      \
-    $(SLO)$/helper_purpenv_Proxy.obj
-SHL2DEPN=$(SHL1TARGETN)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE :	target.mk
-
-ALLTAR:
-	$(MAKE) $(MAKECMDGOALS) -f extra.mk
diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk
deleted file mode 100644
index b3e18032403e..000000000000
--- a/cppu/util/makefile.pmk
+++ /dev/null
@@ -1,27 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-ENABLE_EXCEPTIONS=TRUE
diff --git a/cppu/util/purpenvhelper3MSC.map b/cppu/util/purpenvhelper3MSC.map
deleted file mode 100644
index 5bbb14e9a1ab..000000000000
--- a/cppu/util/purpenvhelper3MSC.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPAU_uno_Environment@@PAVEnterable@3@@Z;
-        ?createMapping@purpenv@helper@cppu@@YAXPAPAU_uno_Mapping@@PAU_uno_Environment@@1P6AX_NPAX3PAU_typelib_TypeDescriptionReference@@PAU_typelib_MethodParameter@@JPBU_typelib_TypeDescription@@3QAPAXPAPAU_uno_Any@@@Z3@Z;
-
-    local:
-        *;
-};
diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map
deleted file mode 100644
index 22485191c805..000000000000
--- a/cppu/util/purpenvhelper3MSCX.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z;
-        ?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z;
-
-    local:
-        *;
-};
diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
deleted file mode 100644
index a94ea7c8dafe..000000000000
--- a/cppu/util/target.pmk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-.IF "$(debug)" == ""
-
-# switch on aggressive opt
-
-# msvc++
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ox
-.ENDIF
-
-# sunpro 5
-.IF "$(COM)" == "C50"
-CFLAGS += -O5 -xO5
-.ENDIF
-
-# gcc
-.IF "$(COM)" == "GCC"
-CFLAGS += -O
-.ENDIF
-
-.ELSE
-
-# msvc++: no inlining
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-
-.ENDIF
-
-.IF "$(COM)$(CPU)" == "MSCX"
-CFLAGS += -DCPPU_LEAK_STATIC_DATA
-.ENDIF
diff --git a/cppu/util/uno_purpenvhelperC52.map b/cppu/util/uno_purpenvhelperC52.map
deleted file mode 100644
index 5213c8ade00a..000000000000
--- a/cppu/util/uno_purpenvhelperC52.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        __1cEcppuGhelperHpurpenvNcreateMapping6FppnM_uno_Mapping_pnQ_uno_Environment_7pFbpv8pnbH_typelib_TypeDescriptionReference_pnY_typelib_MethodParameter_lpknY_typelib_TypeDescription_8p8ppnI_uno_Any__v8_v_; # S-ILP32
-        __1cEcppuGhelperHpurpenvNcreateMapping6FppnM_uno_Mapping_pnQ_uno_Environment_7pFbpv8pnbH_typelib_TypeDescriptionReference_pnY_typelib_MethodParameter_ipknY_typelib_TypeDescription_8p8ppnI_uno_Any__v8_v_; # S-LP64
-        __1cEcppuGhelperHpurpenvbDEnvironment_initWithEnterable6FpnQ_uno_Environment_pn0AJEnterable__v_;
-
-    local:
-        *;
-};
diff --git a/cppu/util/uno_purpenvhelperwntgcc.map b/cppu/util/uno_purpenvhelperwntgcc.map
deleted file mode 100644
index eb224df0b301..000000000000
--- a/cppu/util/uno_purpenvhelperwntgcc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameterlPK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
-        _ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
-
-    local:
-        *;
-};
diff --git a/cppu/util/unsafe_os2.map b/cppu/util/unsafe_os2.map
deleted file mode 100644
index cc6a0ddca448..000000000000
--- a/cppu/util/unsafe_os2.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-    global:
-        uno_initEnvironment;
-        uno_ext_getMapping;
-    local:
-        *;
-};