gbuildize scp2

Change-Id: If9a0906a76943160cfdbd647b26a801bc4389615

68 files changed, 1962 insertions, 2333 deletions

diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
new file mode 100644
index 000000000000..1d1a15793d69
--- /dev/null
+++ b/scp2/CustomTarget_langmacros.mk
@@ -0,0 +1,40 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_CustomTarget_CustomTarget,scp2/macros))
+
+$(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc
+
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir
+
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/set_soenv.stamp
+	$(call gb_Helper_abbreviate_dirs,\
+		export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
+		$(PERL) $< -verbose -o $@ -c $(SRCDIR)/set_soenv.stamp \
+	)
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_accessories.mk b/scp2/InstallModule_accessories.mk
new file mode 100644
index 000000000000..d9df0df4c042
--- /dev/null
+++ b/scp2/InstallModule_accessories.mk
@@ -0,0 +1,89 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/accessories))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/accessories,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
+    scp2/source/accessories/module_accessories \
+))
+
+ifneq ($(WITH_EXTRA_FONT),)
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\
+    scp2/source/accessories/file_font_accessories \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
+    scp2/source/accessories/module_font_accessories \
+))
+endif
+
+ifneq ($(WITH_EXTRA_GALLERY),)
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\
+    scp2/source/accessories/file_gallery_accessories \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
+    scp2/source/accessories/module_gallery_accessories \
+))
+endif
+
+ifneq ($(WITH_EXTRA_SAMPLE),)
+$(eval $(call gb_InstallModule_add_templates,scp2/accessories,\
+    scp2/source/templates/module_langpack_accessories_samples \
+    scp2/source/templates/module_langpack_accessories_samples_root \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\
+    scp2/source/accessories/file_samples_accessories \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
+    scp2/source/accessories/module_samples_accessories \
+))
+endif
+
+ifneq ($(WITH_EXTRA_TEMPLATE),)
+$(eval $(call gb_InstallModule_add_templates,scp2/accessories,\
+    scp2/source/templates/module_langpack_accessories_templates \
+    scp2/source/templates/module_langpack_accessories_templates_root \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\
+    scp2/source/accessories/file_templates_accessories \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
+    scp2/source/accessories/module_templates_accessories \
+))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk
new file mode 100644
index 000000000000..91f9094f2c8e
--- /dev/null
+++ b/scp2/InstallModule_activex.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/activex))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/activex,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/activex,\
+	BUILD_X64 \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/activex,\
+    scp2/source/activex/file_activex \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\
+    scp2/source/activex/module_activex \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
new file mode 100644
index 000000000000..294ad60ecbdf
--- /dev/null
+++ b/scp2/InstallModule_base.mk
@@ -0,0 +1,52 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/base))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/base,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+	ENABLE_REPORTBUILDER \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/base,\
+    scp2/source/templates/module_langpack_base \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/base,\
+    scp2/source/base/file_base \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/base,\
+    scp2/source/base/module_base \
+    scp2/source/base/postgresqlsdbc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk
new file mode 100644
index 000000000000..432ab466378d
--- /dev/null
+++ b/scp2/InstallModule_binfilter.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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/binfilter))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/binfilter,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\
+    scp2/source/binfilter/file_binfilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/binfilter,\
+    scp2/source/binfilter/module_binfilter \
+	$(if $(filter WNT,$(GUI)),\
+		scp2/source/binfilter/registryitem_binfilter \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
new file mode 100644
index 000000000000..b99f8f1fed7f
--- /dev/null
+++ b/scp2/InstallModule_calc.mk
@@ -0,0 +1,51 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/calc))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/calc,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
+	SYSTEM_LPSOLVE \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/calc,\
+    scp2/source/templates/module_langpack_calc \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/calc,\
+    scp2/source/calc/file_calc \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/calc,\
+    scp2/source/calc/module_calc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_canvas.mk b/scp2/InstallModule_canvas.mk
new file mode 100644
index 000000000000..4e4820c43e85
--- /dev/null
+++ b/scp2/InstallModule_canvas.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/canvas))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/canvas,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/canvas,\
+    scp2/source/canvas/canvascommons \
+    scp2/source/canvas/mtfrenderer \
+    scp2/source/canvas/vclcanvas \
+	$(if $(filter TRUE,$(ENABLE_CAIRO_CANVAS)),\
+		scp2/source/canvas/cairocanvas \
+	) \
+	$(if $(filter TRUE,$(ENABLE_DIRECTX)),\
+		scp2/source/canvas/directxcanvas \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/stdlibs/makefile.mk b/scp2/InstallModule_crashrep.mk
index 3040025cabd3..1da89b4ecf24 100644
--- a/scp2/source/stdlibs/makefile.mk
+++ b/scp2/InstallModule_crashrep.mk
@@ -1,5 +1,6 @@
+# -*- 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
@@ -11,7 +12,8 @@
 # License.
 #
 # Major Contributor(s):
-# Petr Mladek <pmladek@suse.cz> (initial developer)
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
@@ -23,30 +25,15 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+$(eval $(call gb_InstallModule_InstallModule,scp2/crashrep))
 
-PRJ=..$/..
-
-PRJNAME=scp2
-TARGET=stdlibs
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(SYSTEM_STDLIBS)" != "YES"
-
-PARFILES =                   \
-        module_stdlibs.par     \
-        file_stdlibs.par
-
-ULFFILES= \
-        module_stdlibs.ulf
-
-.ENDIF
+$(eval $(call gb_InstallModule_use_packages,scp2/crashrep,\
+	scp2_inc \
+	scp2_langmacros \
+))
 
-# --- File ---------------------------------------------------------
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/crashrep,\
+    scp2/source/crashrep/file_crashrep \
+))
 
-.INCLUDE :  target.mk
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
new file mode 100644
index 000000000000..7bf9e56a4468
--- /dev/null
+++ b/scp2/InstallModule_draw.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/draw))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/draw,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/draw,\
+    scp2/source/templates/module_langpack_draw \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/draw,\
+    scp2/source/draw/file_draw \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/draw,\
+    scp2/source/draw/module_draw \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
new file mode 100644
index 000000000000..ad2ae3153564
--- /dev/null
+++ b/scp2/InstallModule_extensions.mk
@@ -0,0 +1,63 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/extensions))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/extensions,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\
+	SYSTEM_BSH \
+	SYSTEM_RHINO \
+))
+
+$(eval $(call gb_InstallModule_add_defs,scp2/extensions,\
+	$(if $(filter YES,$(SYSTEM_BSH)),\
+		-DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \
+	) \
+	$(if $(filter YES,$(SYSTEM_RHINO)),\
+		-DRHINO_JAR=\""$(call gb_Helper_make_url,$(RHINO_JAR))"\" \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
+    scp2/source/templates/module_langpack_extensions_templates \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/extensions,\
+    scp2/source/extensions/directory_extensions \
+    scp2/source/extensions/file_extensions \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/extensions,\
+    scp2/source/extensions/module_extensions \
+    scp2/source/extensions/module_extensions_sun_templates \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
new file mode 100644
index 000000000000..ea20b37403e8
--- /dev/null
+++ b/scp2/InstallModule_gnome.mk
@@ -0,0 +1,52 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/gnome))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/gnome,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+	ENABLE_GCONF \
+	ENABLE_GIO \
+	ENABLE_GNOMEVFS \
+	ENABLE_GTK3 \
+	ENABLE_LOCKDOWN \
+	ENABLE_SYSTRAY_GTK \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
+    scp2/source/gnome/file_gnome \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
+    scp2/source/gnome/module_gnome \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk
new file mode 100644
index 000000000000..0fdd21ad1e06
--- /dev/null
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -0,0 +1,43 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/graphicfilter))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/graphicfilter,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
+    scp2/source/graphicfilter/file_graphicfilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\
+    scp2/source/graphicfilter/module_graphicfilter \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
new file mode 100644
index 000000000000..bbe461ef1da4
--- /dev/null
+++ b/scp2/InstallModule_impress.mk
@@ -0,0 +1,54 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/impress))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/impress,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
+	ENABLE_OPENGL \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/impress,\
+    scp2/source/templates/module_langpack_impress \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
+    scp2/source/impress/file_impress \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/impress,\
+    scp2/source/impress/module_impress \
+	$(if $(filter TRUE,$(ENABLE_OPENGL)),\
+		scp2/source/impress/module_ogltrans \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk
new file mode 100644
index 000000000000..1e7f541b9251
--- /dev/null
+++ b/scp2/InstallModule_javafilter.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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/javafilter))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/javafilter,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\
+    scp2/source/javafilter/file_javafilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\
+    scp2/source/javafilter/module_javafilter \
+	$(if $(filter WNT,$(GUI)),\
+		scp2/source/javafilter/registryitem_javafilter \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk
new file mode 100644
index 000000000000..84cbef7367d9
--- /dev/null
+++ b/scp2/InstallModule_kde.mk
@@ -0,0 +1,48 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/kde))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/kde,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
+	ENABLE_KDE \
+	ENABLE_KDE4 \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/kde,\
+    scp2/source/kde/file_kde \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
+    scp2/source/kde/module_kde \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
new file mode 100644
index 000000000000..c83d7c618bb5
--- /dev/null
+++ b/scp2/InstallModule_math.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/math))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/math,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/math,\
+    scp2/source/templates/module_langpack_math \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/math,\
+    scp2/source/math/file_math \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/math,\
+    scp2/source/math/module_math \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk
new file mode 100644
index 000000000000..3305223e27a4
--- /dev/null
+++ b/scp2/InstallModule_onlineupdate.mk
@@ -0,0 +1,43 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/onlineupdate))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/onlineupdate,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\
+    scp2/source/onlineupdate/file_onlineupdate \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/onlineupdate,\
+    scp2/source/onlineupdate/module_onlineupdate \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
new file mode 100644
index 000000000000..81653a072691
--- /dev/null
+++ b/scp2/InstallModule_ooo.mk
@@ -0,0 +1,247 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/ooo))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/ooo,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
+	DISABLE_ATL \
+	DISABLE_NEON \
+	ENABLE_DIRECTX \
+	ENABLE_EVOAB2 \
+	ENABLE_GTK \
+	ENABLE_GTK3 \
+	ENABLE_KAB \
+	ENABLE_KDE \
+	ENABLE_KDE4 \
+	ENABLE_LOMENUBAR \
+	ENABLE_NSPLUGIN \
+	ENABLE_ONLINE_UPDATE \
+	ENABLE_OPENGL \
+	ENABLE_XMLSEC \
+	MERGELIBS \
+	SYSTEM_CAIRO \
+	SYSTEM_CLUCENE \
+	SYSTEM_CURL \
+	SYSTEM_DB \
+	SYSTEM_EXPAT \
+	SYSTEM_GDKPIXBUF \
+	SYSTEM_GETTEXT \
+	SYSTEM_GLIB \
+	SYSTEM_GRAPHITE \
+	SYSTEM_HUNSPELL \
+	SYSTEM_HYPH \
+	SYSTEM_ICU \
+	SYSTEM_JPEG \
+	SYSTEM_LCMS2 \
+	SYSTEM_LIBCROCO \
+	SYSTEM_LIBEXTTEXTCAT \
+	SYSTEM_LIBGSF \
+	SYSTEM_LIBJPEG \
+	SYSTEM_LIBRSVG \
+	SYSTEM_LIBXML \
+	SYSTEM_LIBXSLT \
+	SYSTEM_LPSOLVE \
+	SYSTEM_LUCENE \
+	SYSTEM_MOZILLA \
+	SYSTEM_MYTHES \
+	SYSTEM_NEON \
+	SYSTEM_OPENSSL \
+	SYSTEM_PANGO \
+	SYSTEM_PORTAUDIO \
+	SYSTEM_REDLAND \
+	SYSTEM_SNDFILE \
+	SYSTEM_STDLIBS \
+	WITH_LDAP \
+))
+
+$(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
+	MINGW_GCCDLL \
+	MINGW_GXXDLL \
+))
+
+$(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
+	MINGW_CAIRO_DLL \
+	MINGW_CRYPTO_DLL \
+	MINGW_CURL_DLL \
+	MINGW_DB_DLL \
+	MINGW_EXPAT_DLL \
+	MINGW_FONTCONFIG_DLL \
+	MINGW_FREETYPE_DLL \
+	MINGW_GCRYPT_DLL \
+	MINGW_GNUTLS_DLL \
+	MINGW_GPG_ERROR_DLL \
+	MINGW_GRAPHITE2_DLL \
+	MINGW_HUNSPELL_DLL \
+	MINGW_HYPHEN_DLL \
+	MINGW_ICONV_DLL \
+	MINGW_ICUDATA_DLL \
+	MINGW_ICUI18N_DLL \
+	MINGW_ICUUC_DLL \
+	MINGW_IDN_DLL \
+	MINGW_INTL_DLL \
+	MINGW_JPEG_DLL \
+	MINGW_LCMS2_DLL \
+	MINGW_LIBXML_DLL \
+	MINGW_LIBXSLT_DLL \
+	MINGW_LPSOLVE_DLL \
+	MINGW_MINIZIP_DLL \
+	MINGW_MYTHES_DLL \
+	MINGW_NEON_DLL \
+	MINGW_NSPR4_DLL \
+	MINGW_NSS3_DLL \
+	MINGW_NSSUTIL3_DLL \
+	MINGW_PIXMAN_DLL \
+	MINGW_PLC4_DLL \
+	MINGW_PLDS4_DLL \
+	MINGW_PNG15_DLL \
+	MINGW_RAPTOR_DLL \
+	MINGW_RASQAL_DLL \
+	MINGW_REDLAND_DLL \
+	MINGW_SQLITE3_DLL \
+	MINGW_SSH2_DLL \
+	MINGW_SSL3_DLL \
+	MINGW_SSL_DLL \
+	MINGW_TASN1_DLL \
+	MINGW_ZLIB_DLL \
+))
+
+include $(OUTDIR)/inc/i18npool/version.mk
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DISOLANG_MAJOR=$(ISOLANG_MAJOR) \
+	$(if $(filter MACOSX,$(OS)),\
+		-DENABLE_CAIROCANVAS \
+	) \
+	$(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\
+		-DENABLE_LIBRSVG \
+	) \
+	$(if $(filter gcj,$(JDK)),\
+		-DGCJ \
+	) \
+	$(if $(filter TRUE,$(ENABLE_GSTREAMER)),\
+		-DGSTREAMER \
+	) \
+	$(if $(WINDOWS_SDK_HOME),\
+		-DHAVE_WINDOWS_SDK \
+	) \
+	$(if $(filter YES,$(SYSTEM_HSQLDB)),\
+		-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
+	) \
+	$(if $(filter YES,$(SYSTEM_SAXON)),\
+		-DSAXON_JAR=\""$(call gb_Helper_make_path,$(SAXON_JAR))"\" \
+	) \
+	$(if $(filter-out YES,$(WITH_MOZILLA)),\
+		-DWITHOUT_MOZILLA \
+	) \
+	$(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\
+		-DWITHOUT_MYSPELL_DICTS \
+	) \
+))
+
+ifeq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DDISABLE_PYUNO \
+))
+else ifeq ($(SYSTEM_PYTHON),YES)
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DSYSTEM_PYTHON \
+))
+endif
+
+ifneq ($(SYSTEM_LIBXSLT),YES)
+include $(OUTDIR)/inc/icuversion.mk
+endif
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DICU_MAJOR=$(ICU_MAJOR) \
+	-DICU_MINOR=$(ICU_MINOR) \
+	-DICU_MICRO=$(ICU_MICRO) \
+))
+
+ifneq ($(SYSTEM_LIBXSLT),YES)
+include $(OUTDIR)/inc/libxsltversion.mk
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
+))
+endif
+
+ifneq ($(SYSTEM_REDLAND),YES)
+include $(OUTDIR)/inc/redlandversion.mk
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
+	-DRASQAL_MAJOR=$(RASQAL_MAJOR) \
+	-DREDLAND_MAJOR=$(REDLAND_MAJOR) \
+))
+endif
+
+$(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
+    scp2/source/templates/module_helppack \
+    scp2/source/templates/module_helppack_root \
+    scp2/source/templates/module_langpack \
+    scp2/source/templates/module_langpack_root \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+    scp2/source/ooo/common_brand \
+    scp2/source/ooo/common_brand_readme \
+    scp2/source/ooo/directory_ooo_macosx \
+    scp2/source/ooo/file_extra_ooo \
+    scp2/source/ooo/file_font_ooo \
+    scp2/source/ooo/file_library_ooo \
+    scp2/source/ooo/file_ooo \
+    scp2/source/ooo/file_resource_ooo \
+    scp2/source/ooo/installation_ooo \
+    scp2/source/ooo/module_help_template \
+    scp2/source/ooo/module_hidden_ooo \
+    scp2/source/ooo/module_lang_template \
+    scp2/source/ooo/ooo_brand \
+    scp2/source/ooo/profile_ooo \
+    scp2/source/ooo/profileitem_ooo \
+    scp2/source/ooo/scpaction_ooo \
+    scp2/source/ooo/shortcut_ooo \
+    scp2/source/ooo/ure_into_ooo \
+    $(if $(filter WNTGCC,$(GUI)$(COM)),\
+		scp2/source/ooo/mingw_dlls \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
+    scp2/source/ooo/directory_ooo \
+    scp2/source/ooo/module_helppack \
+    scp2/source/ooo/module_langpack \
+    scp2/source/ooo/module_ooo \
+    scp2/source/ooo/module_systemint \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
new file mode 100644
index 000000000000..774775de1c0b
--- /dev/null
+++ b/scp2/InstallModule_python.mk
@@ -0,0 +1,63 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/python))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/python,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+ifeq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DDISABLE_PYUNO \
+))
+else ifeq ($(SYSTEM_PYTHON),YES)
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DSYSTEM_PYTHON \
+))
+else
+include $(OUTDIR)/inc/pyversion.mk
+
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DPYVERSION=$(PYVERSION) \
+	-DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
+	-DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) \
+))
+endif
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
+    scp2/source/python/file_python \
+    scp2/source/python/profileitem_python \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\
+    scp2/source/python/module_python \
+    scp2/source/python/module_python_mailmerge \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_quickstart.mk b/scp2/InstallModule_quickstart.mk
new file mode 100644
index 000000000000..0beaeb9da8c8
--- /dev/null
+++ b/scp2/InstallModule_quickstart.mk
@@ -0,0 +1,44 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/quickstart))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/quickstart,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/quickstart,\
+    scp2/source/quickstart/file_quickstart \
+    scp2/source/quickstart/registryitem_quickstart \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/quickstart,\
+    scp2/source/quickstart/module_quickstart \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
new file mode 100644
index 000000000000..c862f3081c16
--- /dev/null
+++ b/scp2/InstallModule_sdkoo.mk
@@ -0,0 +1,39 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/sdkoo))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/sdkoo,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
+    scp2/source/sdkoo/sdkoo \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_smoketest.mk b/scp2/InstallModule_smoketest.mk
new file mode 100644
index 000000000000..09e37eaa0266
--- /dev/null
+++ b/scp2/InstallModule_smoketest.mk
@@ -0,0 +1,39 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/smoketest))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/smoketest,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/smoketest,\
+    scp2/source/smoketest/smoketest \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk
new file mode 100644
index 000000000000..9929c51925fa
--- /dev/null
+++ b/scp2/InstallModule_stdlibs.mk
@@ -0,0 +1,43 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/stdlibs))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/stdlibs,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/stdlibs,\
+    scp2/source/stdlibs/file_stdlibs \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/stdlibs,\
+    scp2/source/stdlibs/module_stdlibs \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
new file mode 100644
index 000000000000..68b1c959a2ee
--- /dev/null
+++ b/scp2/InstallModule_tde.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/tde))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/tde,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
+	ENABLE_TDE \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
+    scp2/source/tde/file_tde \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/tde,\
+    scp2/source/tde/module_tde \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
new file mode 100644
index 000000000000..99594c1f7641
--- /dev/null
+++ b/scp2/InstallModule_ure.mk
@@ -0,0 +1,48 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/ure))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/ure,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
+	SYSTEM_LIBXML \
+))
+
+$(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\
+	MINGW_GCCDLL \
+	MINGW_GXXDLL \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ure,\
+    scp2/source/ooo/ure \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ure_standalone.mk b/scp2/InstallModule_ure_standalone.mk
new file mode 100644
index 000000000000..7def7b7a4284
--- /dev/null
+++ b/scp2/InstallModule_ure_standalone.mk
@@ -0,0 +1,39 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/ure_standalone))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/ure_standalone,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ure_standalone,\
+    scp2/source/ooo/ure_standalone \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk
new file mode 100644
index 000000000000..e81a209ca93e
--- /dev/null
+++ b/scp2/InstallModule_windows.mk
@@ -0,0 +1,68 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/windows))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/windows,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/windows,\
+	BUILD_X64 \
+))
+
+$(eval $(call gb_InstallModule_add_defs,scp2/windows,\
+	$(if $(WINDOWS_SDK_HOME),\
+		-DHAVE_WINDOWS_SDK \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\
+    scp2/source/ooo/folder_ooo \
+    scp2/source/ooo/vc_redist \
+    scp2/source/ooo/windowscustomaction_ooo \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/windows,\
+    scp2/source/base/folderitem_base \
+    scp2/source/base/registryitem_base \
+    scp2/source/calc/folderitem_calc \
+    scp2/source/calc/registryitem_calc \
+    scp2/source/draw/folderitem_draw \
+    scp2/source/draw/registryitem_draw \
+    scp2/source/impress/folderitem_impress \
+    scp2/source/impress/registryitem_impress \
+    scp2/source/math/folderitem_math \
+    scp2/source/math/registryitem_math \
+    scp2/source/ooo/folderitem_ooo \
+    scp2/source/ooo/registryitem_ooo \
+    scp2/source/writer/folderitem_writer \
+    scp2/source/writer/registryitem_writer \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk
new file mode 100644
index 000000000000..1c3b9fbd07e7
--- /dev/null
+++ b/scp2/InstallModule_winexplorerext.mk
@@ -0,0 +1,48 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/winexplorerext))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/winexplorerext,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
+	BUILD_X64 \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
+    scp2/source/winexplorerext/file_winexplorerext \
+    scp2/source/winexplorerext/registryitem_winexplorerext \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/winexplorerext,\
+    scp2/source/winexplorerext/module_winexplorerext \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
new file mode 100644
index 000000000000..bbaf00a5a0c1
--- /dev/null
+++ b/scp2/InstallModule_writer.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/writer))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/writer,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/writer,\
+    scp2/source/templates/module_langpack_writer \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/writer,\
+    scp2/source/writer/file_writer \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/writer,\
+    scp2/source/writer/module_writer \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_xsltfilter.mk b/scp2/InstallModule_xsltfilter.mk
new file mode 100644
index 000000000000..a3fba1b031f8
--- /dev/null
+++ b/scp2/InstallModule_xsltfilter.mk
@@ -0,0 +1,43 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallModule_InstallModule,scp2/xsltfilter))
+
+$(eval $(call gb_InstallModule_use_packages,scp2/xsltfilter,\
+	scp2_inc \
+	scp2_langmacros \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\
+    scp2/source/xsltfilter/file_xsltfilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/xsltfilter,\
+    scp2/source/xsltfilter/module_xsltfilter \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/smoketest/makefile.mk b/scp2/InstallScript_sdkoo.mk
index 5205444947a2..88639288c9bb 100644
--- a/scp2/source/smoketest/makefile.mk
+++ b/scp2/InstallScript_sdkoo.mk
@@ -1,4 +1,4 @@
-#***********************************************************************
+# -*- 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
@@ -12,7 +12,8 @@
 # License.
 #
 # Major Contributor(s):
-# [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
@@ -23,20 +24,11 @@
 # 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.
-#***********************************************************************
 
-PRJ=..$/..
-PRJNAME=scp2so
-TARGET=smoketest
+$(eval $(call gb_InstallScript_InstallScript,sdkoo))
 
-.INCLUDE: settings.mk
+$(eval $(call gb_InstallScript_use_modules,sdkoo,\
+    scp2/sdkoo \
+))
 
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        smoketest.par          
-
-
-.INCLUDE: target.mk
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: #
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
new file mode 100644
index 000000000000..5eca44411f5c
--- /dev/null
+++ b/scp2/InstallScript_setup_osl.mk
@@ -0,0 +1,81 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallScript_InstallScript,setup_osl))
+
+$(eval $(call gb_InstallScript_use_modules,setup_osl,\
+	scp2/accessories \
+	scp2/base \
+	scp2/calc \
+	scp2/canvas \
+	scp2/draw \
+	scp2/graphicfilter \
+	scp2/impress \
+	scp2/math \
+	scp2/ooo \
+	scp2/python \
+	scp2/ure \
+	scp2/writer \
+	scp2/xsltfilter \
+	$(if $(filter WNT,$(GUI)),\
+		scp2/activex \
+		scp2/quickstart \
+		scp2/windows \
+		$(if $(filter MSC,$(COM)),\
+			scp2/winexplorerext \
+		) \
+	) \
+	$(if $(filter YES,$(WITH_BINFILTER)),\
+		scp2/binfilter \
+	) \
+	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
+		scp2/crashrep \
+	) \
+	$(if $(filter YES,$(WITH_EXTENSION_INTEGRATION)),\
+		scp2/extensions \
+	) \
+	$(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+		scp2/gnome \
+	) \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),\
+		scp2/javafilter \
+	) \
+	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+		scp2/kde \
+	) \
+	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+		scp2/onlineupdate \
+	) \
+	$(if $(filter-out YES,$(SYSTEM_STDLIBS)),\
+		scp2/stdlibs \
+	) \
+	$(if $(filter TRUE,$(ENABLE_TDE)),\
+		scp2/tde \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_test.mk b/scp2/InstallScript_test.mk
new file mode 100644
index 000000000000..7f9d722fe851
--- /dev/null
+++ b/scp2/InstallScript_test.mk
@@ -0,0 +1,34 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallScript_InstallScript,test))
+
+$(eval $(call gb_InstallScript_use_modules,test,\
+    scp2/smoketest \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_ure.mk b/scp2/InstallScript_ure.mk
new file mode 100644
index 000000000000..5f09f0fb8745
--- /dev/null
+++ b/scp2/InstallScript_ure.mk
@@ -0,0 +1,35 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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_InstallScript_InstallScript,ure))
+
+$(eval $(call gb_InstallScript_use_modules,ure,\
+	scp2/ure_standalone \
+	scp2/ure \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/Makefile b/scp2/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/scp2/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
new file mode 100644
index 000000000000..48f4686cfc0f
--- /dev/null
+++ b/scp2/Module_scp2.mk
@@ -0,0 +1,89 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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,scp2))
+
+$(eval $(call gb_Module_add_targets,scp2,\
+	CustomTarget_langmacros \
+	InstallModule_accessories \
+	InstallModule_base \
+	InstallModule_calc \
+	InstallModule_canvas \
+	InstallModule_draw \
+	InstallModule_extensions \
+	InstallModule_graphicfilter \
+	InstallModule_impress \
+	InstallModule_math \
+	InstallModule_onlineupdate \
+	InstallModule_ooo \
+	InstallModule_python \
+	InstallModule_sdkoo \
+	InstallModule_smoketest \
+	InstallModule_ure \
+	InstallModule_ure_standalone \
+	InstallModule_writer \
+	InstallModule_xsltfilter \
+	InstallScript_sdkoo \
+	InstallScript_setup_osl \
+	InstallScript_test \
+	Package_inc \
+	Package_langmacros \
+	$(if $(filter WNT,$(GUI)),\
+		InstallModule_activex \
+		InstallModule_quickstart \
+		InstallModule_windows \
+		$(if $(filter MSC,$(COM)),\
+			InstallModule_winexplorerext \
+		) \
+	) \
+	$(if $(filter YES,$(WITH_BINFILTER)),\
+		InstallModule_binfilter \
+	) \
+	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
+		InstallModule_crashrep \
+	) \
+	$(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+		InstallModule_gnome \
+	) \
+	$(if $(filter TRUE,$(SOLAR_JAVA)),\
+		InstallModule_javafilter \
+	) \
+	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+		InstallModule_kde \
+	) \
+	$(if $(filter TRUE,$(ENABLE_TDE)),\
+		InstallModule_tde \
+	) \
+	$(if $(filter-out YES,$(SYSTEM_STDLIBS)),\
+		InstallModule_stdlibs \
+	) \
+	$(if $(filter-out MACOSX,$(OS)),\
+		InstallScript_ure \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/Package_inc.mk b/scp2/Package_inc.mk
new file mode 100644
index 000000000000..ff88ef0730aa
--- /dev/null
+++ b/scp2/Package_inc.mk
@@ -0,0 +1,32 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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,scp2_inc,$(SRCDIR)/scp2/inc))
+
+$(eval $(call gb_Package_add_file,scp2_inc,inc/macros.inc,macros.inc))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/Package_langmacros.mk b/scp2/Package_langmacros.mk
new file mode 100644
index 000000000000..842b92df46a4
--- /dev/null
+++ b/scp2/Package_langmacros.mk
@@ -0,0 +1,32 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.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,scp2_langmacros,$(call gb_CustomTarget_get_workdir,scp2/macros)))
+
+$(eval $(call gb_Package_add_file,scp2_langmacros,inc/langmacros.inc,langmacros.inc))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
deleted file mode 100644
index 249cccbdd833..000000000000
--- a/scp2/macros/makefile.mk
+++ /dev/null
@@ -1,48 +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=scp2
-TARGET=macros
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  target.mk
-
-# force expanding
-COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
-.EXPORT : COMPLETELANGISO_VAR
-
-ALLTAR : $(INCCOM)$/langmacros.inc
-
-.PHONY $(INCCOM)$/langmacros.inc:
-    @echo ------------------------------
-    @echo Making: $@  
-    $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@ -c $(SRC_ROOT)/set_soenv.stamp
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 59ebecec1ecc..d27274469092 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,31 +1,3 @@
 cp    scp2    :    TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
-cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
-cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
-cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros cp_langtemplates NULL
-cp    scp2\source\binfilter       nmake    -    all    cp_binfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_langtemplates NULL
-cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
-cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
-cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
-cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros cp_langtemplates NULL
-cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
-cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
-cp    scp2\source\javafilter      nmake    -    all    cp_javafilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\tde             nmake    -    all    cp_tde cp_langmacros cp_langtemplates NULL
-cp    scp2\source\kde             nmake    -    all    cp_kde cp_langmacros cp_langtemplates NULL
-cp    scp2\source\math            nmake    -    all    cp_math cp_langmacros cp_langtemplates NULL
-cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_langtemplates NULL
-cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
-cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
-cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
-cp    scp2\source\smoketest       nmake    -    all    cp_smoketest cp_langmacros cp_langtemplates NULL
-cp    scp2\source\stdlibs         nmake    -    all    cp_stdlibs cp_langmacros cp_langtemplates NULL
-cp    scp2\source\writer          nmake    -    all    cp_writer cp_langmacros cp_langtemplates NULL
-cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_langtemplates NULL
-cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
-cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_tde cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
+cp    scp2\prj                    nmake    -    all    cp_prj NULL
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
index 0c19b55b0c6c..e69de29bb2d1 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -1,29 +0,0 @@
-..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
-..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
-..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
-..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
-..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
-..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
-..\%__SRC%\bin\osl\test.inf %_DEST%\bin\test.inf
-..\%__SRC%\bin\osl\test.ins %_DEST%\bin\test.ins
-..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
-..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
-
-mkdir: %_DEST%\par
-
-mkdir: %_DEST%\par\osl
-mkdir: %_DEST%\par\fat
-mkdir: %_DEST%\par\fam
-mkdir: %_DEST%\par\ada
-mkdir: %_DEST%\par\adm
-mkdir: %_DEST%\par\omc
-
-..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
-..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
-..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
-..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
-..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
-..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
-
-..\inc\macros.inc %_DEST%\inc\macros.inc
-..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
diff --git a/scp2/prj/dmake b/scp2/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/scp2/prj/dmake
+++ /dev/null
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
deleted file mode 100644
index e3ad66f8fa4f..000000000000
--- a/scp2/source/accessories/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# 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. 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.
-#
-# The Initial Developer of the Original Code is
-#       Kálmán Szalai - KAMI <kami911@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
-#
-#
-# 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.
-#
-
-PRJ=..$/..
-
-PRJNAME=scp2
-TARGET=accessories
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_accessories.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-PARFILES += \
-        module_gallery_accessories.par     \
-        file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-PARFILES += \
-        module_templates_accessories.par   \
-        file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-PARFILES += \
-        module_samples_accessories.par     \
-        file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-PARFILES += \
-        module_font_accessories.par        \
-        file_font_accessories.par
-.ENDIF
-
-ULFFILES= \
-        module_accessories.ulf
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-ULFFILES += \
-        module_gallery_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-ULFFILES += \
-        module_templates_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-ULFFILES += \
-        module_samples_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-ULFFILES += \
-        module_font_accessories.ulf
-.ENDIF
-
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
deleted file mode 100644
index b058351ae310..000000000000
--- a/scp2/source/activex/makefile.mk
+++ /dev/null
@@ -1,54 +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=scp2
-TARGET=activex
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(GUI)"=="WNT"
-PARFILES= \
-        module_activex.par        \
-        file_activex.par
-.ENDIF
-
-ULFFILES= \
-        module_activex.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
deleted file mode 100644
index e3f3b1a72188..000000000000
--- a/scp2/source/base/makefile.mk
+++ /dev/null
@@ -1,62 +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=scp2
-TARGET=base
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(ENABLE_REPORTBUILDER)" == "YES"
-SCPDEFS += -DENABLE_REPORTBUILDER
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_base.par             \
-        file_base.par               \
-        postgresqlsdbc.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_base.par        \
-        folderitem_base.par
-.ENDIF
-
-ULFFILES= \
-        module_base.ulf              \
-        registryitem_base.ulf        \
-        folderitem_base.ulf          \
-        postgresqlsdbc.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
deleted file mode 100644
index 9a8c0a5e90dd..000000000000
--- a/scp2/source/binfilter/makefile.mk
+++ /dev/null
@@ -1,50 +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=scp2
-TARGET=binfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_binfilter.par            \
-        file_binfilter.par              \
-        registryitem_binfilter.par
-
-ULFFILES= \
-        module_binfilter.ulf            \
-        registryitem_binfilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
deleted file mode 100644
index 3a1fa4768058..000000000000
--- a/scp2/source/calc/makefile.mk
+++ /dev/null
@@ -1,59 +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=scp2
-TARGET=calc
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_LPSOLVE)" == "YES"
-SCPDEFS+=-DSYSTEM_LPSOLVE
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_calc.par              \
-        file_calc.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_calc.par        \
-        folderitem_calc.par
-.ENDIF
-
-ULFFILES= \
-        module_calc.ulf              \
-        registryitem_calc.ulf        \
-        folderitem_calc.ulf 
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
deleted file mode 100644
index 24cacaaed2e7..000000000000
--- a/scp2/source/canvas/makefile.mk
+++ /dev/null
@@ -1,54 +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=scp2
-TARGET=canvas
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= canvascommons.par		\
-          vclcanvas.par         \
-		  mtfrenderer.par
-
-.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
-PARFILES+= cairocanvas.par
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)" != ""
-PARFILES+= directxcanvas.par
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
deleted file mode 100644
index 925b9a697202..000000000000
--- a/scp2/source/crashrep/makefile.mk
+++ /dev/null
@@ -1,48 +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=scp2
-TARGET=crashrep
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES = \
-    file_crashrep.par
-
-.ENDIF # "$(ENABLE_CRASHDUMP)" != ""
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
deleted file mode 100644
index 740fc100da13..000000000000
--- a/scp2/source/draw/makefile.mk
+++ /dev/null
@@ -1,56 +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=scp2
-TARGET=draw
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_draw.par              \
-        file_draw.par  
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_draw.par        \
-        folderitem_draw.par
-.ENDIF
-
-
-ULFFILES= \
-        module_draw.ulf              \
-        registryitem_draw.ulf        \
-        folderitem_draw.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
deleted file mode 100644
index b8ee210e5dda..000000000000
--- a/scp2/source/extensions/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-#  OpenOffice.org - a multi-platform office productivity suite
-#
-#  The Contents of this file are made available subject to
-#  the terms of GNU Lesser General Public License Version 3.
-#
-#
-#    GNU Lesser General Public License Version 3
-#    =============================================
-#    Copyright 2005 by Sun Microsystems, Inc.
-#    901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Lesser General Public
-#    License version 2.1, as published by the Free Software Foundation.
-#
-#    This library 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 for more details.
-#
-#    You should have received a copy of the GNU Lesser General Public
-#    License along with this library; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#    MA  02111-1307  USA
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scp2
-TARGET=extensions
-TARGETTYPE=CUI
-
-#--- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_BSH)" == "YES"
-SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
-.ENDIF
-
-.IF "$(SYSTEM_RHINO)" == "YES"
-SCPDEFS+=-DSYSTEM_RHINO -DRHINO_JAR=\""file://$(RHINO_JAR)"\"
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_extensions.par                        \
-        module_extensions_sun_templates.par          \
-        directory_extensions.par                     \
-        file_extensions.par
-
-ULFFILES= \
-        module_extensions.ulf                        \
-        module_extensions_sun_templates.ulf
-
-#--- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
deleted file mode 100644
index eb9120dbe4cc..000000000000
--- a/scp2/source/gnome/makefile.mk
+++ /dev/null
@@ -1,77 +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=scp2
-TARGET=gnome
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
-SCPDEFS+=-DENABLE_SYSTRAY_GTK
-.ENDIF
-
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-
-.IF "$(ENABLE_GCONF)" != ""
-SCPDEFS+=-DENABLE_GCONF
-.ENDIF
-
-.IF "$(ENABLE_LOCKDOWN)" == "YES"
-SCPDEFS+=-DENABLE_LOCKDOWN
-.ENDIF
-
-.IF "$(ENABLE_GNOMEVFS)" != ""
-SCPDEFS+=-DENABLE_GNOMEVFS
-.ENDIF
-
-.IF "$(ENABLE_GIO)" != ""
-SCPDEFS+=-DENABLE_GIO
-.ENDIF
-
-.IF "$(ENABLE_GTK3)" != ""
-SCPDEFS+=-DENABLE_GTK3
-.ENDIF
-
-PARFILES =                   \
-        module_gnome.par     \
-        file_gnome.par
-
-ULFFILES= \
-        module_gnome.ulf
-
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
deleted file mode 100644
index 00514837d294..000000000000
--- a/scp2/source/graphicfilter/makefile.mk
+++ /dev/null
@@ -1,48 +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=scp2
-TARGET=graphicfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_graphicfilter.par            \
-        file_graphicfilter.par
-
-ULFFILES= \
-        module_graphicfilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
deleted file mode 100644
index 44bbc2f4f32f..000000000000
--- a/scp2/source/impress/makefile.mk
+++ /dev/null
@@ -1,67 +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=scp2
-TARGET=impress
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_OPENGL)"=="TRUE"
-SCPDEFS+=-DENABLE_OPENGL
-.ENDIF
-
-PARFILES= \
-        module_impress.par              \
-        file_impress.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_impress.par        \
-        folderitem_impress.par
-.ENDIF
-
-ULFFILES= \
-        module_impress.ulf              \
-        registryitem_impress.ulf        \
-        folderitem_impress.ulf
-
-.IF "$(ENABLE_OPENGL)" == "TRUE"
-PARFILES+=\
-        module_ogltrans.par
-ULFFILES+=\
-    module_ogltrans.ulf
-.ENDIF
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
deleted file mode 100644
index 05be4d6e2f6e..000000000000
--- a/scp2/source/javafilter/makefile.mk
+++ /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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scp2
-TARGET=javafilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SOLAR_JAVA)"=="TRUE"
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_javafilter.par              \
-        file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"=="TRUE"
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_javafilter.par
-.ENDIF
-.ENDIF
-
-ULFFILES= \
-        module_javafilter.ulf              \
-        registryitem_javafilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
deleted file mode 100644
index 02323ff57b3b..000000000000
--- a/scp2/source/kde/makefile.mk
+++ /dev/null
@@ -1,60 +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=scp2
-TARGET=kde
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-
-.IF "$(ENABLE_KDE)" != ""
-SCPDEFS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-SCPDEFS+=-DENABLE_KDE4
-.ENDIF
-
-PARFILES =                   \
-        module_kde.par     \
-        file_kde.par
-
-ULFFILES= \
-        module_kde.ulf
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
deleted file mode 100644
index 055e3a93e238..000000000000
--- a/scp2/source/math/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=scp2
-TARGET=math
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_math.par              \
-        file_math.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_math.par        \
-        folderitem_math.par
-.ENDIF
-
-ULFFILES= \
-        module_math.ulf              \
-        folderitem_math.ulf          \
-        registryitem_math.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
deleted file mode 100644
index dd14e9bd910b..000000000000
--- a/scp2/source/onlineupdate/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=scp2
-TARGET=update
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_onlineupdate.par        \
-        file_onlineupdate.par
-
-ULFFILES= \
-        module_onlineupdate.ulf
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
deleted file mode 100644
index a3bd31b4c918..000000000000
--- a/scp2/source/ooo/makefile.mk
+++ /dev/null
@@ -1,552 +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=scp2
-TARGET=ooo
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  i18npool/version.mk
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCPDEFS+=-DENABLE_ONLINE_UPDATE
-.ENDIF
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-.IF "$(ENABLE_OPENGL)"=="TRUE"
-SCPDEFS+=-DENABLE_OPENGL
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GTK)" != ""
-SCPDEFS+=-DENABLE_GTK
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
-.IF "$(GTK_TWO_FOUR)" != ""
-SCPDEFS+=-DGTK_TWO_FOUR
-.ENDIF
-.ENDIF
-.IF "$(ENABLE_GTK3)" != ""
-SCPDEFS+=-DENABLE_GTK3
-.ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(ENABLE_NSPLUGIN)" == "YES"
-SCPDEFS+=-DENABLE_NSPLUGIN
-.ENDIF
-
-.IF "$(MERGELIBS)" == "TRUE"
-SCPDEFS+=-DMERGELIBS
-.ENDIF
-
-.IF "$(ENABLE_TDE)" != ""
-SCPDEFS+=-DENABLE_TDE
-.ENDIF
-
-.IF "$(ENABLE_KDE)" != ""
-SCPDEFS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-SCPDEFS+=-DENABLE_KDE4
-.ENDIF
-
-.IF "$(ENABLE_TDEAB)" != ""
-SCPDEFS+=-DENABLE_TDEAB
-.ENDIF
-
-.IF "$(ENABLE_KAB)" != ""
-SCPDEFS+=-DENABLE_KAB
-.ENDIF
-
-.IF "$(ENABLE_EVOAB2)" != ""
-SCPDEFS+=-DENABLE_EVOAB2
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)" != ""
-SCPDEFS+=-DENABLE_DIRECTX
-.ENDIF
-
-.IF "$(ENABLE_XMLSEC)"=="YES"
-SCPDEFS+=-DENABLE_XMLSEC
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
-SCPDEFS+=-DENABLE_CAIROCANVAS
-.ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_LUCENE)" == "YES"
-SCPDEFS+=-DSYSTEM_LUCENE
-.ENDIF
-
-.IF "$(SYSTEM_EXPAT)" == "YES"
-SCPDEFS+=-DSYSTEM_EXPAT
-.ENDIF
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-SCPDEFS+=-DSYSTEM_CAIRO
-.ENDIF
-
-.IF "$(SYSTEM_LCMS2)" == "YES"
-SCPDEFS+=-DSYSTEM_LCMS2
-.ENDIF
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBXML
-.ENDIF
-
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBXSLT
-.ELSE
-.INCLUDE :  libxsltversion.mk
-SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
-.ENDIF
-
-.IF "$(SYSTEM_DB)" == "YES"
-SCPDEFS+=-DSYSTEM_DB
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" == "NO"
-SCPDEFS+=-DWITHOUT_MOZILLA
-.ENDIF
-
-.IF "$(WITH_MYSPELL_DICTS)" == "NO"
-SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
-.ENDIF
-
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-SCPDEFS+=-DSYSTEM_MOZILLA
-.ENDIF
-
-.IF "$(SYSTEM_CLUCENE)" == "YES"
-SCPDEFS+=-DSYSTEM_CLUCENE
-.ENDIF
-
-.IF "$(WITH_LDAP)" == "YES"
-SCPDEFS+=-DWITH_LDAP
-.ENDIF
-
-.IF "$(SYSTEM_CURL)" == "YES"
-SCPDEFS+=-DSYSTEM_CURL
-.ENDIF
-
-.IF "$(SYSTEM_STDLIBS)" == "YES"
-SCPDEFS+=-DSYSTEM_STDLIBS
-.ENDIF
-
-.IF "$(SYSTEM_SNDFILE)" == "YES"
-SCPDEFS+=-DSYSTEM_SNDFILE
-.ENDIF
-
-.IF "$(SYSTEM_PORTAUDIO)" == "YES"
-SCPDEFS+=-DSYSTEM_PORTAUDIO
-.ENDIF
-
-.IF "$(SYSTEM_HUNSPELL)" == "YES"
-SCPDEFS+=-DSYSTEM_HUNSPELL
-.ENDIF
-
-.IF "$(SYSTEM_HYPH)" == "YES"
-SCPDEFS+=-DSYSTEM_HYPH
-.ENDIF
-
-.IF "$(SYSTEM_JPEG)" == "YES"
-SCPDEFS+=-DSYSTEM_JPEG
-.ENDIF
-
-.IF "$(SYSTEM_MYTHES)" == "YES"
-SCPDEFS+=-DSYSTEM_MYTHES
-.ENDIF
-
-.IF "$(SYSTEM_LPSOLVE)" == "YES"
-SCPDEFS+=-DSYSTEM_LPSOLVE
-.ENDIF
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-SCPDEFS+=-DSYSTEM_REDLAND
-.ELSE
-.INCLUDE :  redlandversion.mk
-SCPDEFS+=\
-    -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-    -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-    -DREDLAND_MAJOR=$(REDLAND_MAJOR)
-.ENDIF
-
-.IF "$(SYSTEM_HSQLDB)" == "YES"
-SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
-.ENDIF
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
-.ENDIF
-
-.IF "$(JDK)" == "gcj"
-SCPDEFS+=-DGCJ
-.ENDIF
-
-.IF "$(SYSTEM_ICU)" == "YES"
-SCPDEFS+=\
-    -DSYSTEM_ICU \
-    -DICU_MAJOR=$(ICU_MAJOR) \
-    -DICU_MINOR=$(ICU_MINOR) \
-    -DICU_MICRO=$(ICU_MICRO)
-.ELSE
-.INCLUDE :  icuversion.mk
-SCPDEFS+=\
-    -DICU_MAJOR=$(ICU_MAJOR) \
-    -DICU_MINOR=$(ICU_MINOR) \
-    -DICU_MICRO=$(ICU_MICRO)
-.ENDIF
-
-.IF "$(SYSTEM_GRAPHITE)" == "YES"
-SCPDEFS+=-DSYSTEM_GRAPHITE
-.ENDIF
-
-SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
-
-.IF "$(DISABLE_NEON)" == "TRUE"
-SCPDEFS+=-DDISABLE_NEON
-.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES"
-SCPDEFS+=-DSYSTEM_NEON
-.ENDIF
-
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-SCPDEFS+=-DSYSTEM_OPENSSL
-.ENDIF
-
-.IF "$(DISABLE_ATL)"!=""
-SCPDEFS+=-DDISABLE_ATL
-.ENDIF
-
-.IF "$(DISABLE_PYTHON)" == "TRUE"
-SCPDEFS+=-DDISABLE_PYUNO
-.ELSE
-.IF "$(SYSTEM_PYTHON)" == "YES"
-SCPDEFS+=-DSYSTEM_PYTHON
-.ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBEXTTEXTCAT
-.ENDIF
-
-.IF "$(MINGW_GCCDLL)"!=""
-SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GXXDLL)"!=""
-SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
-.ENDIF
-
-.IF "$(MINGW_CAIRO_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_CAIRO_DLL -DMINGW_CAIRO_DLL=\""$(MINGW_CAIRO_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_CURL_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_CURL_DLL -DMINGW_CURL_DLL=\""$(MINGW_CURL_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_CRYPTO_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_CRYPTO_DLL -DMINGW_CRYPTO_DLL=\""$(MINGW_CRYPTO_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_DB_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_DB_DLL -DMINGW_DB_DLL=\""$(MINGW_DB_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_EXPAT_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_EXPAT_DLL -DMINGW_EXPAT_DLL=\""$(MINGW_EXPAT_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_FONTCONFIG_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_FONTCONFIG_DLL -DMINGW_FONTCONFIG_DLL=\""$(MINGW_FONTCONFIG_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_FREETYPE_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_FREETYPE_DLL -DMINGW_FREETYPE_DLL=\""$(MINGW_FREETYPE_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GCRYPT_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_GCRYPT_DLL -DMINGW_GCRYPT_DLL=\""$(MINGW_GCRYPT_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GNUTLS_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_GNUTLS_DLL -DMINGW_GNUTLS_DLL=\""$(MINGW_GNUTLS_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GPG_ERROR_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_GPG_ERROR_DLL -DMINGW_GPG_ERROR_DLL=\""$(MINGW_GPG_ERROR_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GRAPHITE2_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_GRAPHITE2_DLL -DMINGW_GRAPHITE2_DLL=\""$(MINGW_GRAPHITE2_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_HUNSPELL_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_HUNSPELL_DLL -DMINGW_HUNSPELL_DLL=\""$(MINGW_HUNSPELL_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_HYPHEN_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_HYPHEN_DLL -DMINGW_HYPHEN_DLL=\""$(MINGW_HYPHEN_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_ICONV_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_ICONV_DLL -DMINGW_ICONV_DLL=\""$(MINGW_ICONV_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_ICUDATA_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_ICUDATA_DLL -DMINGW_ICUDATA_DLL=\""$(MINGW_ICUDATA_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_ICUI18N_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_ICUI18N_DLL -DMINGW_ICUI18N_DLL=\""$(MINGW_ICUI18N_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_ICUUC_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_ICUUC_DLL -DMINGW_ICUUC_DLL=\""$(MINGW_ICUUC_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_IDN_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_IDN_DLL -DMINGW_IDN_DLL=\""$(MINGW_IDN_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_INTL_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_INTL_DLL -DMINGW_INTL_DLL=\""$(MINGW_INTL_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_JPEG_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_JPEG_DLL -DMINGW_JPEG_DLL=\""$(MINGW_JPEG_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_LCMS2_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_LCMS2_DLL -DMINGW_LCMS2_DLL=\""$(MINGW_LCMS2_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_LIBXML_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_LIBXML_DLL -DMINGW_LIBXML_DLL=\""$(MINGW_LIBXML_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_LIBXSLT_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_LIBXSLT_DLL -DMINGW_LIBXSLT_DLL=\""$(MINGW_LIBXSLT_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_LPSOLVE_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_LPSOLVE_DLL -DMINGW_LPSOLVE_DLL=\""$(MINGW_LPSOLVE_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_MINIZIP_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_MINIZIP_DLL -DMINGW_MINIZIP_DLL=\""$(MINGW_MINIZIP_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_MYTHES_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_MYTHES_DLL -DMINGW_MYTHES_DLL=\""$(MINGW_MYTHES_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_NEON_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_NEON_DLL -DMINGW_NEON_DLL=\""$(MINGW_NEON_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_NSPR4_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_NSPR4_DLL -DMINGW_NSPR4_DLL=\""$(MINGW_NSPR4_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_NSS3_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_NSS3_DLL -DMINGW_NSS3_DLL=\""$(MINGW_NSS3_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_NSSUTIL3_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_NSSUTIL3_DLL -DMINGW_NSSUTIL3_DLL=\""$(MINGW_NSSUTIL3_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_PIXMAN_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_PIXMAN_DLL -DMINGW_PIXMAN_DLL=\""$(MINGW_PIXMAN_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_PLC4_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_PLC4_DLL -DMINGW_PLC4_DLL=\""$(MINGW_PLC4_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_PLDS4_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_PLDS4_DLL -DMINGW_PLDS4_DLL=\""$(MINGW_PLDS4_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_PNG15_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_PNG15_DLL -DMINGW_PNG15_DLL=\""$(MINGW_PNG15_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_RAPTOR_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_RAPTOR_DLL -DMINGW_RAPTOR_DLL=\""$(MINGW_RAPTOR_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_RASQAL_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_RASQAL_DLL -DMINGW_RASQAL_DLL=\""$(MINGW_RASQAL_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_REDLAND_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_REDLAND_DLL -DMINGW_REDLAND_DLL=\""$(MINGW_REDLAND_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_SQLITE3_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_SQLITE3_DLL -DMINGW_SQLITE3_DLL=\""$(MINGW_SQLITE3_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_SSH2_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_SSH2_DLL -DMINGW_SSH2_DLL=\""$(MINGW_SSH2_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_SSL_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_SSL_DLL -DMINGW_SSL_DLL=\""$(MINGW_SSL_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_SSL3_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_SSL3_DLL -DMINGW_SSL3_DLL=\""$(MINGW_SSL3_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_TASN1_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_TASN1_DLL -DMINGW_TASN1_DLL=\""$(MINGW_TASN1_DLL)"\"
-.ENDIF
-
-.IF "$(MINGW_ZLIB_DLL)" != ""
-SCPDEFS += -DNEEDS_MINGW_ZLIB_DLL -DMINGW_ZLIB_DLL=\""$(MINGW_ZLIB_DLL)"\"
-.ENDIF
-
-.IF "$(SYSTEM_GDKPIXBUF)" == "YES"
-SCPDEFS+=-DSYSTEM_GDKPIXBUF
-.ENDIF
-
-.IF "$(SYSTEM_GETTEXT)" == "YES"
-SCPDEFS+=-DSYSTEM_GETTEXT
-.ENDIF
-
-.IF "$(SYSTEM_GLIB)" == "YES"
-SCPDEFS+=-DSYSTEM_GLIB
-.ENDIF
-
-.IF "$(SYSTEM_LIBCROCO)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBCROCO
-.ENDIF
-
-.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
-SCPDEFS+=-DENABLE_LIBRSVG
-.ENDIF
-
-.IF "$(SYSTEM_LIBRSVG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBRSVG
-.ENDIF
-
-.IF "$(SYSTEM_PANGO)" == "YES"
-SCPDEFS+=-DSYSTEM_PANGO
-.ENDIF
-
-.IF "$(SYSTEM_LIBGSF)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBGSF
-.ENDIF
-
-.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
-SCPDEFS+=-DENABLE_LOMENUBAR
-.ENDIF
-
-# Synchronize with condition to build the jfregqa.dll custom action in setup_native
-.IF "$(WINDOWS_SDK_HOME)"!=""
-SCPDEFS+=-DHAVE_WINDOWS_SDK
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-ICUVERSION_DEPENDENT_FILES= \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/file_library_ooo.par \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/shortcut_ooo.par
-
-ISOLANGVERSION_DEPENDENT_FILES= \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/file_library_ooo.par
-
-PARFILES=                          \
-        installation_ooo.par       \
-        scpaction_ooo.par          \
-        directory_ooo.par          \
-        directory_ooo_macosx.par   \
-        file_ooo.par               \
-        file_extra_ooo.par         \
-        file_font_ooo.par          \
-        file_library_ooo.par       \
-        file_resource_ooo.par      \
-        shortcut_ooo.par           \
-        module_ooo.par             \
-        module_hidden_ooo.par      \
-        module_langpack.par        \
-        module_lang_template.par   \
-        module_helppack.par        \
-        module_help_template.par   \
-        module_systemint.par       \
-        profile_ooo.par            \
-        profileitem_ooo.par        \
-        ure.par                    \
-        ure_into_ooo.par           \
-        ure_standalone.par         \
-        common_brand.par           \
-        common_brand_readme.par    \
-        ooo_brand.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES +=                        \
-        folder_ooo.par             \
-        folderitem_ooo.par         \
-        registryitem_ooo.par       \
-        vc_redist.par              \
-        mingw_dlls.par             \
-        windowscustomaction_ooo.par
-.ENDIF
-
-ULFFILES=                          \
-        directory_ooo.ulf          \
-        folderitem_ooo.ulf         \
-        module_ooo.ulf             \
-        module_langpack.ulf        \
-        module_helppack.ulf        \
-        registryitem_ooo.ulf       \
-        module_systemint.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
-
-.IF "$(SYSTEM_ICU)" != "YES"
-$(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
-.ENDIF
-
-$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
-
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
deleted file mode 100644
index dffc045ab05e..000000000000
--- a/scp2/source/python/makefile.mk
+++ /dev/null
@@ -1,65 +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=scp2
-TARGET=python
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(DISABLE_PYTHON)" == "TRUE"
-SCPDEFS+=-DDISABLE_PYUNO
-.ELSE
-.IF "$(SYSTEM_PYTHON)" == "YES"
-SCPDEFS+=-DSYSTEM_PYTHON
-.ELSE
-.INCLUDE :      pyversion.mk
-.ENDIF
-.ENDIF
-
-SCPDEFS+=\
-    -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
-    -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME)
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES=\
-        module_python.par              \
-        module_python_mailmerge.par    \
-        profileitem_python.par         \
-        file_python.par
-
-ULFFILES= \
-        module_python.ulf              \
-        module_python_mailmerge.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
deleted file mode 100644
index bb40db2a24ff..000000000000
--- a/scp2/source/quickstart/makefile.mk
+++ /dev/null
@@ -1,51 +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=scp2
-TARGET=quickstart
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(GUI)"=="WNT"
-PARFILES= \
-        module_quickstart.par              \
-        file_quickstart.par                \
-        registryitem_quickstart.par
-.ENDIF
-
-ULFFILES= \
-        module_quickstart.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk
deleted file mode 100644
index 6b4200b4671c..000000000000
--- a/scp2/source/sdkoo/makefile.mk
+++ /dev/null
@@ -1,46 +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=scp2so
-TARGET=sdkoo
-
-.INCLUDE: settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        sdkoo.par          
-
-#.IF "$(OS)" == "MACOSX"
-#PARFILES+= module_sdkoo.par
-#
-#ULFFILES= module_sdkoo.ulf
-#.ENDIF
-
-
-.INCLUDE: target.mk
diff --git a/scp2/source/tde/makefile.mk b/scp2/source/tde/makefile.mk
deleted file mode 100644
index 03bd0ba56dbe..000000000000
--- a/scp2/source/tde/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# 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. 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.
-#
-# The Initial Developer of the Original Code is
-# Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=tde
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_TDE)" == "TRUE"
-
-.IF "$(ENABLE_TDE)" != ""
-SCPDEFS+=-DENABLE_TDE
-.ENDIF
-
-PARFILES =                   \
-        module_tde.par     \
-        file_tde.par
-
-ULFFILES= \
-        module_tde.ulf
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
deleted file mode 100644
index 32026b7e7774..000000000000
--- a/scp2/source/templates/makefile.mk
+++ /dev/null
@@ -1,56 +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=scp2
-TARGET=templates
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  target.mk
-
-# force expanding
-COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
-.EXPORT : COMPLETELANGISO_VAR
-
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
-
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
-.IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
-PHONYTEMPL=.PHONY
-.ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
-$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
-    @@-$(RENAME) $@ $@.tmp
-    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
-$(INCCOM)$/allhelpmodules%.inc $(PHONYTEMPL) : module_helppack%.sct
-    @@-$(RENAME) $@ $@.tmp
-    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_help_track.mk
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
deleted file mode 100644
index 98b716b37e77..000000000000
--- a/scp2/source/winexplorerext/makefile.mk
+++ /dev/null
@@ -1,56 +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=scp2
-TARGET=winexpext
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-# The Explorer extensions don't build with MinGW
-.IF "$(GUI)" == "WNT" && "$(COM)" == "MSC"
-PARFILES= \
-        module_winexplorerext.par        \
-        file_winexplorerext.par          \
-        registryitem_winexplorerext.par
-.ENDIF
-
-ULFFILES= \
-        module_winexplorerext.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
deleted file mode 100644
index 6fd453df0373..000000000000
--- a/scp2/source/writer/makefile.mk
+++ /dev/null
@@ -1,56 +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=scp2
-TARGET=writer
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_writer.par              \
-        file_writer.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_writer.par        \
-        folderitem_writer.par
-.ENDIF
-
-ULFFILES= \
-        module_writer.ulf              \
-        registryitem_writer.ulf        \
-        folderitem_writer.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
deleted file mode 100644
index 5c586f2542b9..000000000000
--- a/scp2/source/xsltfilter/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=scp2
-TARGET=xsltfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_xsltfilter.par     \
-        file_xsltfilter.par
-
-ULFFILES= \
-        module_xsltfilter.ulf
-
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
deleted file mode 100644
index daafb585ec7a..000000000000
--- a/scp2/util/makefile.mk
+++ /dev/null
@@ -1,258 +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=scp2
-TARGET=setup
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- setup script -------------------------------------------------------
-# SCPFLAGS= -w
-
-# ------------------------------------------------------------------------
-# Office OSL
-
-SCP1LINK_PRODUCT_TYPE=osl
-SCP1TARGET = setup_osl
-SCP1FILES  = installation_ooo.par          \
-             scpaction_ooo.par             \
-             directory_ooo.par             \
-             file_ooo.par                  \
-             file_extra_ooo.par            \
-             file_font_ooo.par             \
-             file_library_ooo.par          \
-             file_resource_ooo.par         \
-             shortcut_ooo.par              \
-             module_ooo.par                \
-             module_hidden_ooo.par         \
-             module_langpack.par           \
-             module_lang_template.par      \
-             module_helppack.par           \
-             module_help_template.par      \
-             profile_ooo.par               \
-             profileitem_ooo.par           \
-             module_writer.par             \
-             file_writer.par               \
-             module_calc.par               \
-             file_calc.par                 \
-             module_draw.par               \
-             file_draw.par                 \
-             module_impress.par            \
-             file_impress.par              \
-             module_base.par               \
-             file_base.par                 \
-             canvascommons.par             \
-             module_math.par               \
-             file_math.par                 \
-             module_systemint.par          \
-             module_graphicfilter.par      \
-             file_graphicfilter.par        \
-             module_extensions.par         \
-             module_extensions_sun_templates.par         \
-             directory_extensions.par                     \
-             file_extensions.par           \
-             module_xsltfilter.par         \
-             file_xsltfilter.par           \
-             module_python.par             \
-             module_python_mailmerge.par   \
-             file_python.par               \
-             profileitem_python.par        \
-             module_accessories.par        \
-             postgresqlsdbc.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-SCP1FILES +=                               \
-             module_gallery_accessories.par   \
-             file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-SCP1FILES +=                               \
-             module_samples_accessories.par   \
-             file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-SCP1FILES +=                               \
-             module_templates_accessories.par \
-             file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-SCP1FILES +=                               \
-             module_font_accessories.par      \
-             file_font_accessories.par
-.ENDIF
-.IF "$(SYSTEM_STDLIBS)" != "YES"
-SCP1FILES +=                               \
-             module_stdlibs.par            \
-             file_stdlibs.par
-.ENDIF
-SCP1FILES +=                               \
-             ure_into_ooo.par              \
-             ure.par                       \
-             common_brand.par              \
-             common_brand_readme.par       \
-             ooo_brand.par
-
-.IF "$(OS)"=="MACOSX" 
-SCP1FILES +=                               \
-             directory_ooo_macosx.par
-.ENDIF
- 
-.IF "$(WITH_BINFILTER)" != "NO"
-SCP1FILES +=                               \
-             module_binfilter.par          \
-             registryitem_binfilter.par    \
-             file_binfilter.par
-.ENDIF
-
-.IF "$(ENABLE_OPENGL)" == "TRUE"
-SCP1FILES +=                               \
-             module_ogltrans.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-SCP1FILES +=                               \
-             module_javafilter.par         \
-             file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!="" 
-.IF "$(GUI)"=="WNT"
-SCP1FILES +=                               \
-             registryitem_javafilter.par
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SCP1FILES +=                           \
-             registryitem_ooo.par      \
-             folder_ooo.par            \
-             folderitem_ooo.par        \
-             windowscustomaction_ooo.par \
-             vc_redist.par             \
-             mingw_dlls.par            \
-             registryitem_writer.par   \
-             folderitem_writer.par     \
-             registryitem_calc.par     \
-             folderitem_calc.par       \
-             registryitem_draw.par     \
-             folderitem_draw.par       \
-             registryitem_impress.par  \
-             folderitem_impress.par    \
-             registryitem_base.par     \
-             folderitem_base.par       \
-             registryitem_math.par     \
-             folderitem_math.par       \
-             module_quickstart.par     \
-             file_quickstart.par       \
-             registryitem_quickstart.par
-
-# The Explorer extensions don't build with MinGW
-.IF "$(COM)" == "MSC"
-SCP1FILES +=                           \
-             module_winexplorerext.par \
-             file_winexplorerext.par   \
-             registryitem_winexplorerext.par
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)"!=""
-SCP1FILES += directxcanvas.par
-.ENDIF
-
-.IF "$(DISABLE_ACTIVEX)"==""
-SCP1FILES +=                           \
-             module_activex.par        \
-             file_activex.par 
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-SCP1FILES += \
-             module_gnome.par   \
-             file_gnome.par
-.ENDIF
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-SCP1FILES += \
-             module_kde.par     \
-             file_kde.par
-.ENDIF
-
-.IF "$(ENABLE_TDE)" == "TRUE"
-SCP1FILES += \
-             module_tde.par     \
-             file_tde.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-SCP1FILES += \
-             file_crashrep.par
-.ENDIF
-
-SCP1FILES += \
-             vclcanvas.par \
-			 mtfrenderer.par
-
-.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
-SCP1FILES += cairocanvas.par
-.ENDIF
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCP1FILES += \
-             module_onlineupdate.par   \
-             file_onlineupdate.par
-.ENDIF
-
-# ------------------------------------------------------------------------
-# URE
-
-.IF "$(OS)" != "MACOSX"
-SCP2LINK_PRODUCT_TYPE = osl
-SCP2TARGET = ure
-SCP2FILES = ure_standalone.par  \
-            ure.par
-.ENDIF
-
-# ------------------------------------------------------------------------
-# SDK
-
-SCP3LINK_PRODUCT_TYPE = osl
-SCP3TARGET = sdkoo
-SCP3FILES = sdkoo.par
-
-# ------------------------------------------------------------------------
-# Test
-
-SCP4LINK_PRODUCT_TYPE = osl
-SCP4TARGET = test
-SCP4FILES = smoketest.par
-
-# --- target -------------------------------------------------------------
-.INCLUDE :  target.mk