gbuildize desktop

115 files changed, 3251 insertions, 3317 deletions

diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk
new file mode 100644
index 000000000000..1ccd45eb5b94
--- /dev/null
+++ b/desktop/AllLangResTarget_deployment.mk
@@ -0,0 +1,56 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_AllLangResTarget_AllLangResTarget,deployment))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,deployment,desktop))
+
+$(eval $(call gb_AllLangResTarget_add_srs,deployment,\
+    deployment/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,deployment/res))
+
+$(eval $(call gb_SrsTarget_set_include,deployment/res,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/source/deployment/registry/inc \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,deployment/res,\
+    desktop/source/deployment/manager/dp_manager.src \
+    desktop/source/deployment/misc/dp_misc.src \
+    desktop/source/deployment/registry/component/dp_component.src \
+    desktop/source/deployment/registry/configuration/dp_configuration.src \
+    desktop/source/deployment/registry/dp_registry.src \
+    desktop/source/deployment/registry/help/dp_help.src \
+    desktop/source/deployment/registry/package/dp_package.src \
+    desktop/source/deployment/registry/script/dp_script.src \
+    desktop/source/deployment/registry/sfwk/dp_sfwk.src \
+    desktop/source/deployment/unopkg/unopkg.src \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
new file mode 100644
index 000000000000..997ee4281f1a
--- /dev/null
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -0,0 +1,53 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_AllLangResTarget_AllLangResTarget,deploymentgui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,deploymentgui,desktop))
+
+$(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\
+    deploymentgui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res))
+
+$(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/source/deployment/registry/inc \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\
+    desktop/source/deployment/gui/dp_gui_backend.src \
+    desktop/source/deployment/gui/dp_gui_dependencydialog.src \
+    desktop/source/deployment/gui/dp_gui_dialog2.src \
+    desktop/source/deployment/gui/dp_gui_dialog.src \
+    desktop/source/deployment/gui/dp_gui_updatedialog.src \
+    desktop/source/deployment/gui/dp_gui_updateinstalldialog.src \
+    desktop/source/deployment/gui/dp_gui_versionboxes.src \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk
new file mode 100644
index 000000000000..3e3cb1815508
--- /dev/null
+++ b/desktop/AllLangResTarget_dkt.mk
@@ -0,0 +1,44 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_AllLangResTarget_AllLangResTarget,dkt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dkt,desktop))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dkt,\
+    dkt/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dkt/res))
+
+$(eval $(call gb_SrsTarget_set_include,dkt/res,\
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dkt/res,\
+    desktop/source/app/desktop.src \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
new file mode 100644
index 000000000000..478cb1d82c54
--- /dev/null
+++ b/desktop/Executable_guiloader.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,guiloader))
+
+$(eval $(call gb_Executable_set_targettype_gui,guiloader,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,guiloader,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,guiloader,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,guiloader,\
+    ooopathutils_hack \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,guiloader,\
+    desktop/win32/source/extendloaderenvironment \
+    desktop/win32/source/guiloader/genericloader \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk
new file mode 100644
index 000000000000..e38efa2be638
--- /dev/null
+++ b/desktop/Executable_guistdio.mk
@@ -0,0 +1,45 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,guistdio))
+
+$(eval $(call gb_Executable_set_targettype_gui,guistdio,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,guistdio,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,guistdio,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,guistdio,\
+    $(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,guistdio,\
+    desktop/win32/source/guistdio/guistdio \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
new file mode 100644
index 000000000000..6e34dc69b1e8
--- /dev/null
+++ b/desktop/Executable_loader2.mk
@@ -0,0 +1,59 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,loader2))
+
+$(eval $(call gb_Executable_add_precompiled_header,loader2,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,loader2,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Executable_add_defs,loader2,\
+    -D_DEBUG
+))
+endif
+
+$(eval $(call gb_Executable_add_libs,loader2,\
+    advapi32 \
+    gdi32 \
+    msi \
+    shell32 \
+))
+
+ifneq ($(COM),GCC)
+$(eval $(call gb_Executable_add_libs,loader2,\
+    libcmt.lib \
+))
+endif
+
+$(eval $(call gb_Executable_add_exception_objects,loader2,\
+    desktop/win32/source/setup/setup_main \
+    desktop/win32/source/setup/setup_w \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
new file mode 100644
index 000000000000..e6b0a0dc6d3c
--- /dev/null
+++ b/desktop/Executable_officeloader.mk
@@ -0,0 +1,71 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,officeloader))
+
+$(eval $(call gb_Executable_add_precompiled_header,officeloader,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,officeloader,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,officeloader,\
+    advapi32 \
+    sal \
+    shell32 \
+    shlwapi \
+))
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Executable_set_ldflags,\
+    $(filter -bind_at_load,$$(LDFLAGS)) \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,officeloader,\
+    desktop/unx/source/officeloader/officeloader \
+))
+
+$(eval $(call gb_Executable_add_cobjects,officeloader,\
+    desktop/source/app/copyright_ascii_ooo.c \
+))
+
+endif
+
+ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Executable_add_linked_libs,officeloader,\
+    ooopathutils_hack \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,officeloader,\
+    desktop/win32/source/extendloaderenvironment \
+    desktop/win32/source/officeloader/officeloader \
+))
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
new file mode 100644
index 000000000000..3cf7baebad8e
--- /dev/null
+++ b/desktop/Executable_oosplash.mk
@@ -0,0 +1,82 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,oosplash))
+
+$(eval $(call gb_Executable_set_targettype_gui,oosplash,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,oosplash,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,oosplash,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+    sal \
+))
+
+$(eval $(call gb_Executable_add_cobjects,oosplash,\
+    desktop/unx/source/args \
+    desktop/unx/source/file_image_unx \
+    desktop/unx/source/pagein \
+    desktop/unx/source/splashx \
+    desktop/unx/source/start \
+))
+
+ifeq ($(USE_XINERAMA),YES)
+
+$(eval $(call gb_Executable_add_defs,oosplash,\
+    -DUSE_XINERAMA \
+))
+
+$(eval $(call gb_Executable_add_libs,oosplash,\
+    -lX11 \
+    -lXinerama \
+))
+
+endif
+
+ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE)
+
+$(eval $(call gb_Executable_add_defs,oosplash,\
+    -DENABLE_QUICKSTART_LIBPNG \
+))
+
+$(eval $(call gb_Executable_use_externals,oosplash,\
+    png \
+))
+
+endif
+
+ifeq ($(OS),SOLARIS)
+
+$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+    -lsocket \
+))
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
new file mode 100644
index 000000000000..aa5e608c2dd7
--- /dev/null
+++ b/desktop/Executable_quickstart.mk
@@ -0,0 +1,62 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,quickstart))
+
+$(eval $(call gb_Executable_add_precompiled_header,quickstart,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,quickstart,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_libs,quickstart,\
+    comdlg32 \
+    gdi32 \
+    kernel32 \
+    ole32 \
+    oleauth32 \
+    shell32 \
+))
+
+ifeq ($(COM),GCC)
+
+$(eval $(call gb_Executable_add_libs,quickstart,\
+    uuid \
+))
+
+else
+
+$(eval $(call gb_Executable_add_libs,quickstart,\
+    comsupp.lib \
+))
+
+endif
+
+$(eval $(call gb_Executable_add_exception_objects,quickstart,\
+    desktop/win32/source/QuickStart/QuickStart \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
new file mode 100644
index 000000000000..5cd916b0816d
--- /dev/null
+++ b/desktop/Executable_sbase.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,sbase))
+
+$(eval $(call gb_Executable_set_targettype_gui,sbase,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,sbase,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,sbase,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,sbase,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,sbase,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/sbase \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
new file mode 100644
index 000000000000..e93aea2ee88e
--- /dev/null
+++ b/desktop/Executable_scalc.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,scalc))
+
+$(eval $(call gb_Executable_set_targettype_gui,scalc,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,scalc,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,scalc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,scalc,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,scalc,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/scalc \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
new file mode 100644
index 000000000000..dc13c41ebfa3
--- /dev/null
+++ b/desktop/Executable_sdraw.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,sdraw))
+
+$(eval $(call gb_Executable_set_targettype_gui,sdraw,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,sdraw,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,sdraw,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,sdraw,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,sdraw,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/sdraw \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
new file mode 100644
index 000000000000..728d8e3d20b0
--- /dev/null
+++ b/desktop/Executable_simpress.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,simpress))
+
+$(eval $(call gb_Executable_set_targettype_gui,simpress,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,simpress,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,simpress,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,simpress,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,simpress,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/simpress \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
new file mode 100644
index 000000000000..b7c9307a565d
--- /dev/null
+++ b/desktop/Executable_smath.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,smath))
+
+$(eval $(call gb_Executable_set_targettype_gui,smath,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,smath,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,smath,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,smath,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,smath,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/smath \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
new file mode 100644
index 000000000000..3f6e78ee8b1f
--- /dev/null
+++ b/desktop/Executable_soffice.bin.mk
@@ -0,0 +1,56 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,soffice.bin))
+
+$(eval $(call gb_Executable_set_targettype_gui,soffice.bin,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,soffice.bin,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,soffice.bin,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,soffice.bin,\
+    sal \
+    sofficeapp \
+))
+
+$(eval $(call gb_Executable_add_cobjects,soffice.bin,\
+    desktop/source/app/copyright_ascii_ooo \
+    desktop/source/app/main \
+))
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Executable_set_ldflags,\
+    $(filter-out -bind_at_load,$$(LDFLAGS)) \
+))
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
new file mode 100644
index 000000000000..050f1e0db07d
--- /dev/null
+++ b/desktop/Executable_soffice.mk
@@ -0,0 +1,65 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,soffice))
+
+$(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,soffice,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,soffice,\
+    sal \
+    sofficeapp \
+))
+
+$(eval $(call gb_Executable_add_cobjects,soffice,\
+    desktop/source/app/copyright_ascii_ooo.c \
+    desktop/source/app/main.c \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,soffice,\
+    ooopathutils_hack \
+))
+
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Executable_set_ldflags,\
+    $$(LDFLAGS) \
+    /STACK:10000000 \
+))
+
+endif
+
+$(eval $(call gb_Executable_add_noexception_objects,soffice,\
+    desktop/win32/source/extendloaderenvironment \
+    desktop/win32/source/soffice/soffice \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
new file mode 100644
index 000000000000..14e9296f1754
--- /dev/null
+++ b/desktop/Executable_sweb.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,sweb))
+
+$(eval $(call gb_Executable_set_targettype_gui,sweb,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,sweb,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,sweb,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,sweb,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,sweb,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/sweb \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
new file mode 100644
index 000000000000..30e98b14cb90
--- /dev/null
+++ b/desktop/Executable_swriter.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,swriter))
+
+$(eval $(call gb_Executable_set_targettype_gui,swriter,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,swriter,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,swriter,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,swriter,\
+    -DUNICODE \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,swriter,\
+    desktop/win32/source/applauncher/launcher \
+    desktop/win32/source/applauncher/swriter \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
new file mode 100644
index 000000000000..50da655d5208
--- /dev/null
+++ b/desktop/Executable_unoinfo.mk
@@ -0,0 +1,43 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,unoinfo))
+
+$(eval $(call gb_Executable_add_precompiled_header,unoinfo,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,unoinfo,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,unoinfo,\
+    ooopathutils_hack \
+))
+
+$(eval $(call gb_Executable_add_noexception_objects,unoinfo,\
+    desktop/win32/source/unoinfo \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
new file mode 100644
index 000000000000..e472b1d001bd
--- /dev/null
+++ b/desktop/Executable_unopkg.bin.mk
@@ -0,0 +1,49 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 licable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,unopkg.bin))
+
+$(eval $(call gb_Executable_set_targettype_gui,unopkg.bin,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,unopkg.bin,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,unopkg.bin,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,unopkg.bin,\
+    comphelper \
+    sal \
+    tl \
+    unopkgapp \
+))
+
+$(eval $(call gb_Executable_add_cobjects,unopkg.bin,\
+    desktop/source/pkgchk/unopkg/unopkg_main \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
new file mode 100644
index 000000000000..3dffb08d5e97
--- /dev/null
+++ b/desktop/Executable_unopkg.mk
@@ -0,0 +1,49 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 licable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,unopkg))
+
+$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,unopkg,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,unopkg,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,unopkg,\
+    comphelper \
+    sal \
+    tl \
+    unopkgapp \
+))
+
+$(eval $(call gb_Executable_add_cobjects,unopkg,\
+    desktop/source/pkgchk/unopkg/unopkg_main \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkgio.mk b/desktop/Executable_unopkgio.mk
new file mode 100644
index 000000000000..4563c8e4d547
--- /dev/null
+++ b/desktop/Executable_unopkgio.mk
@@ -0,0 +1,45 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Executable_Executable,unopkgio))
+
+$(eval $(call gb_Executable_set_targettype_gui,unopkgio,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,unopkgio,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,unopkgio,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,unopkgio,\
+    $(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,unopkgio,\
+    desktop/win32/source/guistdio/unopkgio \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
new file mode 100644
index 000000000000..dd1c3f36e946
--- /dev/null
+++ b/desktop/Library_deployment.mk
@@ -0,0 +1,95 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,deployment))
+
+$(eval $(call gb_Library_add_precompiled_header,deployment,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,deployment,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/deployment/inc \
+    -I$(SRCDIR)/desktop/source/deployment/registry/inc \
+))
+
+$(eval $(call gb_Library_add_api,deployment,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,deployment,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    deploymentmisc \
+    helplinker \
+    sal \
+    svl \
+    tl \
+    ucbhelper \
+    utl \
+    xcr \
+))
+
+$(eval $(call gb_Library_use_externals,deployment,\
+    berkeleydb \
+))
+
+$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
+
+$(eval $(call gb_Library_add_exception_objects,deployment,\
+    desktop/source/deployment/dp_log \
+    desktop/source/deployment/dp_persmap \
+    desktop/source/deployment/dp_services \
+    desktop/source/deployment/dp_xml \
+    desktop/source/deployment/manager/dp_activepackages \
+    desktop/source/deployment/manager/dp_commandenvironments \
+    desktop/source/deployment/manager/dp_extensionmanager \
+    desktop/source/deployment/manager/dp_informationprovider \
+    desktop/source/deployment/manager/dp_manager \
+    desktop/source/deployment/manager/dp_managerfac \
+    desktop/source/deployment/manager/dp_properties \
+    desktop/source/deployment/registry/component/dp_compbackenddb \
+    desktop/source/deployment/registry/component/dp_component \
+    desktop/source/deployment/registry/configuration/dp_configuration \
+    desktop/source/deployment/registry/configuration/dp_configurationbackenddb \
+    desktop/source/deployment/registry/dp_backend \
+    desktop/source/deployment/registry/dp_backenddb \
+    desktop/source/deployment/registry/dp_registry \
+    desktop/source/deployment/registry/executable/dp_executable \
+    desktop/source/deployment/registry/executable/dp_executablebackenddb \
+    desktop/source/deployment/registry/help/dp_help \
+    desktop/source/deployment/registry/help/dp_helpbackenddb \
+    desktop/source/deployment/registry/package/dp_extbackenddb \
+    desktop/source/deployment/registry/package/dp_package \
+    desktop/source/deployment/registry/script/dp_lib_container \
+    desktop/source/deployment/registry/script/dp_script \
+    desktop/source/deployment/registry/script/dp_scriptbackenddb \
+    desktop/source/deployment/registry/sfwk/dp_parceldesc \
+    desktop/source/deployment/registry/sfwk/dp_sfwk \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
new file mode 100644
index 000000000000..15de5974651d
--- /dev/null
+++ b/desktop/Library_deploymentgui.mk
@@ -0,0 +1,79 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,deploymentgui))
+
+$(eval $(call gb_Library_add_precompiled_header,deploymentgui,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,deploymentgui,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/deployment/inc \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,deploymentgui,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    deploymentmisc \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sfx \
+    svl \
+    svt \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
+
+$(eval $(call gb_Library_add_exception_objects,deploymentgui,\
+    desktop/source/deployment/gui/descedit \
+    desktop/source/deployment/gui/dp_gui_autoscrolledit \
+    desktop/source/deployment/gui/dp_gui_dependencydialog \
+    desktop/source/deployment/gui/dp_gui_dialog2 \
+    desktop/source/deployment/gui/dp_gui_extensioncmdqueue \
+    desktop/source/deployment/gui/dp_gui_extlistbox \
+    desktop/source/deployment/gui/dp_gui_service \
+    desktop/source/deployment/gui/dp_gui_theextmgr \
+    desktop/source/deployment/gui/dp_gui_thread \
+    desktop/source/deployment/gui/dp_gui_updatedialog \
+    desktop/source/deployment/gui/dp_gui_updateinstalldialog \
+    desktop/source/deployment/gui/license_dialog \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
new file mode 100644
index 000000000000..83172b93f854
--- /dev/null
+++ b/desktop/Library_deploymentmisc.mk
@@ -0,0 +1,75 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,deploymentmisc))
+
+$(eval $(call gb_Library_add_precompiled_header,deploymentmisc,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,deploymentmisc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/deployment/inc \
+))
+
+$(eval $(call gb_Library_add_api,deploymentmisc,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,deploymentmisc,\
+    -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,deploymentmisc,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    tl \
+    ucbhelper \
+    utl \
+    xcr \
+))
+
+$(eval $(call gb_Library_use_externals,deploymentmisc,\
+    berkeleydb \
+))
+
+$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
+    desktop/source/deployment/misc/db \
+    desktop/source/deployment/misc/dp_dependencies \
+    desktop/source/deployment/misc/dp_descriptioninfoset \
+    desktop/source/deployment/misc/dp_identifier \
+    desktop/source/deployment/misc/dp_interact \
+    desktop/source/deployment/misc/dp_misc \
+    desktop/source/deployment/misc/dp_platform \
+    desktop/source/deployment/misc/dp_resource \
+    desktop/source/deployment/misc/dp_ucb \
+    desktop/source/deployment/misc/dp_update \
+    desktop/source/deployment/misc/dp_version \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
new file mode 100644
index 000000000000..aac204c4cebb
--- /dev/null
+++ b/desktop/Library_migrationoo2.mk
@@ -0,0 +1,64 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,migrationoo2))
+
+$(eval $(call gb_Library_add_precompiled_header,migrationoo2,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,migrationoo2,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,migrationoo2,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,migrationoo2,\
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    jvmfwk \
+    sal \
+    tl \
+    utl \
+))
+
+$(eval $(call gb_Library_use_externals,migrationoo2,\
+    berkeleydb \
+))
+
+$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
+
+$(eval $(call gb_Library_add_exception_objects,migrationoo2,\
+    desktop/source/migration/services/autocorrmigration \
+    desktop/source/migration/services/basicmigration \
+    desktop/source/migration/services/cexports \
+    desktop/source/migration/services/jvmfwk \
+    desktop/source/migration/services/wordbookmigration \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
new file mode 100644
index 000000000000..006c7a902799
--- /dev/null
+++ b/desktop/Library_migrationoo3.mk
@@ -0,0 +1,59 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,migrationoo3))
+
+$(eval $(call gb_Library_add_precompiled_header,migrationoo3,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,migrationoo3,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,migrationoo3,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,migrationoo3,\
+    cppu \
+    cppuhelper \
+    sal \
+    tl \
+    utl \
+))
+
+$(eval $(call gb_Library_use_externals,migrationoo3,\
+    berkeleydb \
+))
+
+$(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
+
+$(eval $(call gb_Library_add_exception_objects,migrationoo3,\
+    desktop/source/migration/services/cexportsoo3 \
+    desktop/source/migration/services/oo3extensionmigration \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
new file mode 100644
index 000000000000..6d54c613c8e5
--- /dev/null
+++ b/desktop/Library_offacc.mk
@@ -0,0 +1,52 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,offacc))
+
+$(eval $(call gb_Library_add_precompiled_header,offacc,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,offacc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,offacc,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,offacc,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc))
+
+$(eval $(call gb_Library_add_exception_objects,offacc,\
+    desktop/source/offacc/acceptor \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
new file mode 100644
index 000000000000..f9e98395269d
--- /dev/null
+++ b/desktop/Library_sofficeapp.mk
@@ -0,0 +1,97 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,sofficeapp))
+
+$(eval $(call gb_Library_add_precompiled_header,sofficeapp,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Library_set_include,sofficeapp,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,sofficeapp,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,sofficeapp,\
+    -DDESKTOP_DLLIMPLEMENTATION \
+    $(if $(firstword TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
+    $(if $(firstword WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
+    $(if $(firstword aqua,$(GUIBASE)),-DENABLE_QUICKSTART_APPLET) \
+    $(if $(firstword TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
+))
+
+$(eval $(call gb_Library_set_include,sofficeapp,\
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sofficeapp,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    deploymentmisc \
+    i18nisolang1 \
+    sal \
+    sfx \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
+    desktop/source/app/app \
+    desktop/source/app/appfirststart \
+    desktop/source/app/appinit \
+    desktop/source/app/appsys \
+    desktop/source/app/check_ext_deps \
+    desktop/source/app/cmdlineargs \
+    desktop/source/app/cmdlinehelp \
+    desktop/source/app/configinit \
+    desktop/source/app/desktopcontext \
+    desktop/source/app/desktopresid \
+    desktop/source/app/dispatchwatcher \
+    desktop/source/app/langselect \
+    desktop/source/app/lockfile \
+    desktop/source/app/lockfile2 \
+    desktop/source/app/officeipcthread \
+    desktop/source/app/sofficemain \
+    desktop/source/app/userinstall \
+    desktop/source/migration/migration \
+))
+
+$(eval $(call gb_Library_add_cobjects,sofficeapp,\
+    desktop/source/app/copyright_ascii_ooo \
+    desktop/source/app/main \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
new file mode 100644
index 000000000000..f65d7a8ca48b
--- /dev/null
+++ b/desktop/Library_spl.mk
@@ -0,0 +1,60 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,spl))
+
+$(eval $(call gb_Library_add_precompiled_header,spl,$(SRCDIR)/desktop/inc/pch/precompiled_desktop))
+
+$(eval $(call gb_Library_set_include,spl,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,spl,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,spl,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
+
+$(eval $(call gb_Library_add_exception_objects,spl,\
+    desktop/source/migration/migration \
+    desktop/source/splash/services_spl \
+    desktop/source/splash/splash \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
new file mode 100644
index 000000000000..89464da36b48
--- /dev/null
+++ b/desktop/Library_spl_unx.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,spl_unx))
+
+$(eval $(call gb_Library_add_precompiled_header,spl_unx,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Library_add_api,spl_unx,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,spl_unx,\
+    cppu \
+    cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash))
+
+$(eval $(call gb_Library_add_exception_objects,spl_unx,\
+    desktop/unx/splash/unxsplash \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
new file mode 100644
index 000000000000..5aa3e7195775
--- /dev/null
+++ b/desktop/Library_unopkgapp.mk
@@ -0,0 +1,66 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Library_Library,unopkgapp))
+
+$(eval $(call gb_Library_add_precompiled_header,unopkgapp,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Library_set_include,unopkgapp,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+    -I$(SRCDIR)/desktop/inc/pch \
+    -I$(SRCDIR)/desktop/source/deployment/inc \
+    -I$(SRCDIR)/desktop/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,unopkgapp,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,unopkgapp,\
+    -DDESKTOP_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,unopkgapp,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    deploymentmisc \
+    sal \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,unopkgapp,\
+    desktop/source/app/lockfile \
+    desktop/source/pkgchk/unopkg/unopkg_app \
+    desktop/source/pkgchk/unopkg/unopkg_cmdenv \
+    desktop/source/pkgchk/unopkg/unopkg_misc \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/source/deployment/registry/package/makefile.mk b/desktop/Makefile
index 203ce176d289..8d71119918b6 100755..100644
--- a/desktop/source/deployment/registry/package/makefile.mk
+++ b/desktop/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,24 +26,14 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME = desktop
-TARGET = deployment_registry_package
-ENABLE_EXCEPTIONS = TRUE
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.INCLUDE : settings.mk
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    dp_package.src
-
-INCPRE += ..$/..$/inc
-
-SLOFILES = \
-        $(SLO)$/dp_package.obj \
-        $(SLO)$/dp_extbackenddb.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
new file mode 100644
index 000000000000..ad63561ce022
--- /dev/null
+++ b/desktop/Module_desktop.mk
@@ -0,0 +1,121 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+# FIXME: Okay, so this is ugly hack, because
+# include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))Pagein.mk
+# does not work from tail_build. I think I should just move Pagein.mk
+# into gbuild proper...
+#
+# On the other side, I wonder how many of our gbuild classes /
+# implementations would break when using with multiple repos as they
+# were originally intended, i.e., with different root dirs.
+include $(SRCDIR)/desktop/Pagein.mk
+
+$(eval $(call gb_Module_Module,desktop))
+
+$(eval $(call gb_Module_add_targets,desktop,\
+    AllLangResTarget_deployment \
+    AllLangResTarget_deploymentgui \
+    AllLangResTarget_dkt \
+    Library_deployment \
+    Library_deploymentgui \
+    Library_deploymentmisc \
+    Library_migrationoo2 \
+    Library_migrationoo3 \
+    Library_offacc \
+    Library_sofficeapp \
+    Library_spl \
+    Library_unopkgapp \
+    Package_branding \
+    Package_intro \
+    Pagein_calc \
+    Pagein_common \
+    Pagein_draw \
+    Pagein_impress \
+    Pagein_writer \
+    Zip_brand \
+    Zip_brand_dev \
+    Zip_shell \
+))
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_guiloader \
+    Executable_guistdio \
+    Executable_loader2 \
+    Executable_officeloader \
+    Executable_quickstart \
+    Executable_sbase \
+    Executable_scalc \
+    Executable_sdraw \
+    Executable_simpress \
+    Executable_soffice \
+    Executable_smath \
+    Executable_sweb \
+    Executable_swriter \
+    Executable_unoinfo \
+    Executable_unopkg \
+    Executable_unopkgio \
+    Package_manifest \
+    Package_rcfile \
+    WinResTarget_officeloader \
+    WinResTarget_quickstart \
+    WinResTarget_sbase \
+    WinResTarget_scalc \
+    WinResTarget_sdraw \
+    WinResTarget_simpress \
+    WinResTarget_soffice \
+    WinResTarget_smath \
+    WinResTarget_sweb \
+    WinResTarget_swriter \
+))
+
+else
+
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_soffice.bin \
+    Executable_unopkg.bin \
+))
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_officeloader \
+))
+
+else
+
+$(eval $(call gb_Module_add_targets,desktop,\
+    Executable_oosplash \
+    Library_spl_unx \
+    Package_scripts \
+))
+
+endif
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
new file mode 100644
index 000000000000..c1956cde947c
--- /dev/null
+++ b/desktop/Package_branding.mk
@@ -0,0 +1,30 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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,desktop_branding,$(WORKDIR)/CustomTarget/desktop/branding))
+
+$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding,SRCDIR))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_intro.mk b/desktop/Package_intro.mk
new file mode 100644
index 000000000000..b54c90bf4398
--- /dev/null
+++ b/desktop/Package_intro.mk
@@ -0,0 +1,33 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+# The patsubst is used to remove the trailing '/' dir produces.
+# Otherwise the package tries to depend on zip target brand//intro,
+# which is unfortunately different from brand/intro...
+$(eval $(call gb_Package_Package,desktop_intro,$(patsubst %/,%,$(dir $(call gb_Zip_get_target,brand/intro)))))
+
+$(eval $(call gb_Package_add_file,desktop_intro,pck/intro.zip,intro.zip))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk
new file mode 100644
index 000000000000..c694b620dc22
--- /dev/null
+++ b/desktop/Package_manifest.mk
@@ -0,0 +1,36 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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,desktop_manifest,$(WORKDIR)/CustomTarget/desktop/util))
+
+$(eval $(call gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR))
+
+$(eval (call gb_CustomTarget_add_outdir_dependencies,desktop/util,\
+    bin/soffice.exe \
+))
+
+$(eval $(call gb_Package_add_file,desktop_manifest,bin/soffice.exe.manifest,soffice.exe.manifest))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_rcfile.mk b/desktop/Package_rcfile.mk
new file mode 100644
index 000000000000..49abab0f9ae4
--- /dev/null
+++ b/desktop/Package_rcfile.mk
@@ -0,0 +1,30 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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,desktop_rcfile,$(WORKDIR)/CustomTarget/win32/source/setup))
+
+$(eval $(call gb_Package_add_customtarget,desktop_rcfile,desktop/win32/source/setup,SRCDIR))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
new file mode 100644
index 000000000000..9292940c530a
--- /dev/null
+++ b/desktop/Package_scripts.mk
@@ -0,0 +1,42 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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,desktop_scripts,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/mozwrapper,mozwrapper.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/smaster,smaster.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/sweb,sweb.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Pagein.mk b/desktop/Pagein.mk
new file mode 100644
index 000000000000..616b9cc1c706
--- /dev/null
+++ b/desktop/Pagein.mk
@@ -0,0 +1,102 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+desktop_Pagein_get_target = $(WORKDIR)/Pagein/desktop/$(1)
+desktop_Pagein_get_clean_target = $(WORKDIR)/Clean/Pagein/desktop/$(1)
+desktop_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
+
+desktop_Pagein__istype = $(findstring $(2),$(call desktop_Pagein__prefix,$(1)))
+desktop_Pagein__prefix = $(firstword $(subst :, ,$(1)))
+desktop_Pagein__suffix = $(lastword $(subst :, ,$(1)))
+desktop_Pagein__object = $(call desktop_Pagein__suffix,$(1))
+desktop_Pagein__dir = $(call desktop_Pagein__prefix,$(1))
+desktop_Pagein__libname = $(notdir $(call gb_Library_get_target,$(call desktop_Pagein__suffix,$(1))))
+desktop_Pagein__libpath = $(call desktop_Pagein__dir,$(1))/$(call desktop_Pagein__libname,$(1))
+
+desktop_Pagein__make_path = \
+$(if $(call desktop_Pagein__istype,$(1),OBJ),\
+    $(call desktop_Pagein__object,$(1)),\
+    $(if $(call desktop_Pagein__istype,$(1),LIB),\
+        $(call desktop_Pagein__libname,$(1)),\
+        $(call desktop_Pagein__libpath,$(1))))
+
+define desktop_Pagein__command
+$(call gb_Output_announce,$(2),$(true),PAG,5)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && rm -f $(1) \
+    $(foreach object,$(OBJECTS),&& echo $(call desktop_Pagein__make_path,$(object)) >> $(1)))
+
+endef
+
+.PHONY : $(call desktop_Pagein_get_clean_target,%)
+$(call desktop_Pagein_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),PAG,5)
+	$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call desktop_Pagein_get_target,$*) $(call desktop_Pagein_get_outdir_target,$*))
+
+$(call desktop_Pagein_get_target,%) :
+	$(call desktop_Pagein__command,$@,$*,$^)
+	
+$(call desktop_Pagein_get_outdir_target,%) : $(call desktop_Pagein_get_target,%)
+	$(call gb_Deliver_deliver,$<,$@)
+
+define desktop_Pagein_Pagein
+$(call desktop_Pagein_get_target,$(1)) : OBJECTS :=
+$$(eval $$(call gb_Module_register_target,$(call desktop_Pagein_get_outdir_target,$(1)),$(call desktop_Pagein_get_clean_target,$(1))))
+$(call desktop_Pagein_get_outdir_target,$(1)) : $(call desktop_Pagein_get_target,$(1))
+
+endef
+
+define desktop_Pagein_add_lib
+$(call desktop_Pagein_get_target,$(1)) : OBJECTS += LIB:$(2)
+
+endef
+
+define desktop_Pagein_add_lib_with_dir
+$(call desktop_Pagein_get_target,$(1)) : OBJECTS += $(strip $(3)):$(2)
+
+endef
+
+define desktop_Pagein_add_object
+$(call desktop_Pagein_get_target,$(1)) : OBJECTS += OBJ:$(2)
+
+endef
+
+define desktop_Pagein_add_libs
+$(foreach lib,$(2),$(call desktop_Pagein_add_lib,$(1),$(lib)))
+
+endef
+
+define desktop_Pagein_add_libs_with_dir
+$(foreach lib,$(2),$(call desktop_Pagein_add_lib_with_dir,$(1),$(lib),$(3)))
+
+endef
+
+define desktop_Pagein_add_objects
+$(foreach object,$(2),$(call desktop_Pagein_add_object,$(1),$(object)))
+
+endef
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Pagein_calc.mk b/desktop/Pagein_calc.mk
new file mode 100644
index 000000000000..64c2bf9f21bd
--- /dev/null
+++ b/desktop/Pagein_calc.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 desktop_Pagein_Pagein,calc))
+
+$(eval $(call desktop_Pagein_add_libs,calc,\
+    sc \
+    scui \
+    svx \
+    svxcore \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
new file mode 100644
index 000000000000..3b0330c396df
--- /dev/null
+++ b/desktop/Pagein_common.mk
@@ -0,0 +1,112 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 desktop_Pagein_Pagein,common))
+
+# sorted in approx. reverse load order (ld.so.1)
+$(eval $(call desktop_Pagein_add_libs,common,\
+    i18npool \
+    $(if $(findstring YES,$(SYSTEM_ICU)),,\
+        icui18n \
+        icule \
+        icuuc \
+    ) \
+    lng \
+    xo \
+    fwe \
+    fwk \
+    fwi \
+    fwl \
+    package2 \
+    ucpfile \
+    ucb \
+    configmgr \
+    vclplug_gen \
+    $(if $(findstring TRUE,$(ENABLE_GTK)),vclplug_gtk) \
+    $(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \
+    basegfx \
+    sot \
+    xcr \
+    sb \
+))
+
+$(eval $(call desktop_Pagein_add_libs_with_dir,common,\
+    stocservices \
+    bootstrap \
+    reg \
+    store \
+    reflection \
+    cppuhelper \
+    cppu \
+    sal \
+    ,../ure-link/lib \
+))
+
+$(eval $(call desktop_Pagein_add_libs,common,\
+    ucbhelper \
+    comphelper \
+    tl \
+    utl \
+    svl \
+    vcl \
+    tk \
+))
+
+$(eval $(call desktop_Pagein_add_objects,common,\
+    ../ure-link/share/misc/types.rdb \
+    services.rdb \
+    oovbaapi.rdb \
+))
+
+# TODO: Hmm, so it looks like there are duplicates in the list... Moreover,
+# some that are conditional above are not conditional here (e.g., icule).
+# I have doubts about gconfbe, desktopbe and localebe too.
+$(eval $(call desktop_Pagein_add_libs,common,\
+    deployment \
+    deploymentmisc \
+    ucb \
+    xstor \
+    package2 \
+    filterconfig \
+    uui \
+    lng \
+    svt \
+    spl \
+    basegfx \
+    avmedia \
+    helplinker \
+    vclplug_gen \
+    icule \
+    sax \
+    gconfbe \
+    fsstorage \
+    desktopbe \
+    localebe \
+    ucpexpand \
+    sfx \
+    sofficeapp \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Pagein_draw.mk b/desktop/Pagein_draw.mk
new file mode 100644
index 000000000000..d3cc26a67a3b
--- /dev/null
+++ b/desktop/Pagein_draw.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 desktop_Pagein_Pagein,draw))
+
+$(eval $(call desktop_Pagein_add_libs,draw,\
+    sd \
+    sdui \
+    svx \
+    svxcore \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Pagein_impress.mk b/desktop/Pagein_impress.mk
new file mode 100644
index 000000000000..96043f21cb12
--- /dev/null
+++ b/desktop/Pagein_impress.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 desktop_Pagein_Pagein,impress))
+
+$(eval $(call desktop_Pagein_add_libs,impress,\
+    sd \
+    sdui \
+    svx \
+    svxcore \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Pagein_writer.mk b/desktop/Pagein_writer.mk
new file mode 100644
index 000000000000..ccd24674bde5
--- /dev/null
+++ b/desktop/Pagein_writer.mk
@@ -0,0 +1,35 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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 desktop_Pagein_Pagein,writer))
+
+$(eval $(call desktop_Pagein_add_libs,writer,\
+    sw \
+    swui \
+    svx \
+    svxcore \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_officeloader.mk b/desktop/WinResTarget_officeloader.mk
new file mode 100644
index 000000000000..4c089995e257
--- /dev/null
+++ b/desktop/WinResTarget_officeloader.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,officeloader))
+
+$(eval $(call gb_WinResTarget_set_include,officeloader,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,officeloader,\
+    $$(DEFS) \
+    -DRES_APP_NAME=officeloader \
+    -DRES_APP_ICON=icons/ooo3_main_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,officeloader,\
+    sysui/desktop/icons/ooo3_main_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,officeloader,util/officeloader.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
new file mode 100644
index 000000000000..cf518aa0a765
--- /dev/null
+++ b/desktop/WinResTarget_quickstart.mk
@@ -0,0 +1,40 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,quickstart))
+
+$(eval $(call gb_WinResTarget_set_include,quickstart,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/win32/source/QuickStart \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,quickstart,\
+    sysui/desktop/icons/ooo3_main_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,quickstart,desktop/win32/source/QuickStart/OOQuickStart))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
new file mode 100644
index 000000000000..5d6589bf5612
--- /dev/null
+++ b/desktop/WinResTarget_sbase.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,sbase))
+
+$(eval $(call gb_WinResTarget_set_include,sbase,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,sbase,\
+    $$(DEFS) \
+    -DRES_APP_NAME=sbase \
+    -DRES_APP_ICON=icons/ooo3_base_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,sbase,\
+    sysui/desktop/icons/ooo3_base_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
new file mode 100644
index 000000000000..7ed3cb748220
--- /dev/null
+++ b/desktop/WinResTarget_scalc.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,scalc))
+
+$(eval $(call gb_WinResTarget_set_include,scalc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,scalc,\
+    $$(DEFS) \
+    -DRES_APP_NAME=scalc \
+    -DRES_APP_ICON=icons/ooo3_calc_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,scalc,\
+    sysui/desktop/icons/ooo3_calc_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
new file mode 100644
index 000000000000..696a660b651a
--- /dev/null
+++ b/desktop/WinResTarget_sdraw.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,sdraw))
+
+$(eval $(call gb_WinResTarget_set_include,sdraw,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,sdraw,\
+    $$(DEFS) \
+    -DRES_APP_NAME=sdraw \
+    -DRES_APP_ICON=icons/ooo3_draw_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,sdraw,\
+    sysui/desktop/icons/ooo3_draw_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
new file mode 100644
index 000000000000..5c2ab48a6280
--- /dev/null
+++ b/desktop/WinResTarget_simpress.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,simpress))
+
+$(eval $(call gb_WinResTarget_set_include,simpress,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,simpress,\
+    $$(DEFS) \
+    -DRES_APP_NAME=simpress \
+    -DRES_APP_ICON=icons/ooo3_impress_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,simpress,\
+    sysui/desktop/icons/ooo3_impress_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
new file mode 100644
index 000000000000..228f53eeb68b
--- /dev/null
+++ b/desktop/WinResTarget_smath.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,smath))
+
+$(eval $(call gb_WinResTarget_set_include,smath,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,smath,\
+    $$(DEFS) \
+    -DRES_APP_NAME=smath \
+    -DRES_APP_ICON=icons/ooo3_math_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,smath,\
+    sysui/desktop/icons/ooo3_math_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,smath,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
new file mode 100644
index 000000000000..dc8f145d2f5b
--- /dev/null
+++ b/desktop/WinResTarget_soffice.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,soffice))
+
+$(eval $(call gb_WinResTarget_set_include,soffice,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,soffice,\
+    $$(DEFS) \
+    -DRES_APP_NAME=soffice \
+    -DRES_APP_ICON=icons/ooo3_main_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,soffice,\
+    sysui/desktop/icons/ooo3_main_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,soffice,util/officeloader.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
new file mode 100644
index 000000000000..2f20df4ae89c
--- /dev/null
+++ b/desktop/WinResTarget_sweb.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,sweb))
+
+$(eval $(call gb_WinResTarget_set_include,sweb,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,sweb,\
+    $$(DEFS) \
+    -DRES_APP_NAME=sweb \
+    -DRES_APP_ICON=icons/ooo3_web_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,sweb,\
+    sysui/desktop/icons/ooo3_web_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,sweb,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
new file mode 100644
index 000000000000..c19268cf2e1a
--- /dev/null
+++ b/desktop/WinResTarget_swriter.mk
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_WinResTarget_WinResTarget,swriter))
+
+$(eval $(call gb_WinResTarget_set_include,swriter,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sysui/desktop \
+))
+
+$(eval $(call gb_WinResTarget_set_defs,swriter,\
+    $$(DEFS) \
+    -DRES_APP_NAME=swriter \
+    -DRES_APP_ICON=icons/ooo3_writer_app.ico \
+    -DVERVARIANT=$(BUILD) \
+))
+
+$(eval $(call gb_WinResTarget_add_dependency,swriter,\
+    sysui/desktop/icons/ooo3_writer_app.ico \
+))
+
+$(eval $(call gb_WinResTarget_add_file,swriter,desktop/win32/source/applauncher/launcher.rc))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
new file mode 100644
index 000000000000..4e89c778dfa2
--- /dev/null
+++ b/desktop/Zip_brand.mk
@@ -0,0 +1,37 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Zip_Zip,brand/intro,$(WORKDIR)/CustomTarget/desktop/branding))
+
+$(eval $(call gb_Zip_add_files,brand/intro,\
+    about.png \
+    intro.png \
+))
+
+$(eval $(call gb_Zip_add_dependencies,brand/intro,\
+    $(call gb_Package_get_target,desktop_branding) \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
new file mode 100644
index 000000000000..9a7a9ead3b07
--- /dev/null
+++ b/desktop/Zip_brand_dev.mk
@@ -0,0 +1,33 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Zip_Zip,brand_dev/intro,$(SRCDIR)/default_images/brand_dev))
+
+$(eval $(call gb_Zip_add_files,brand_dev/intro,\
+    about.png \
+    intro.png \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_shell.mk b/desktop/Zip_shell.mk
new file mode 100644
index 000000000000..df11bb1b8da9
--- /dev/null
+++ b/desktop/Zip_shell.mk
@@ -0,0 +1,36 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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_Zip_Zip,shell,$(SRCDIR)/default_images/brand/shell))
+
+$(eval $(call gb_Zip_add_files,shell,\
+    backing_left.png \
+    backing_right.png \
+    backing_space.png \
+    backing_rtl_left.png \
+    backing_rtl_right.png \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
new file mode 100644
index 000000000000..cdd37ab77821
--- /dev/null
+++ b/desktop/branding/Makefile
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+SRCDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/../..)
+
+ifndef ABOUT_BITMAP
+ABOUT_BITMAP := $(SRCDIR)/default_images/brand/about.png
+endif
+
+ifndef INTRO_BITMAP
+INTRO_BITMAP := $(SRCDIR)/default_images/brand/intro.png
+endif
+
+$(WORKDIR)/CustomTarget/desktop/branding/about.png : $(ABOUT_BITMAP)
+	mkdir -p $(dir $@) && cp -p $< $@
+
+$(WORKDIR)/CustomTarget/desktop/branding/intro.png : $(INTRO_BITMAP)
+	mkdir -p $(dir $@) && cp -p $< $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+	$(WORKDIR)/CustomTarget/desktop/branding/about.png \
+	$(WORKDIR)/CustomTarget/desktop/branding/intro.png
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
deleted file mode 100755
index 8715d814274f..000000000000
--- a/desktop/inc/makefile.mk
+++ /dev/null
@@ -1,47 +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=desktop
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 79686d30f46c..73be88f7705e 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,44 +1,3 @@
 dt      desktop :    TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offapi filter LIBXSLT:libxslt NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
-dt	desktop\inc								nmake	-	all	dt_inc NULL
-dt	desktop\prj								get		-	all	dt_prj NULL
-dt	desktop\res								get		-	all	dt_res NULL
-dt	desktop\source\app						nmake	-	all	dt_app dt_migr dt_inc dt_dp_misc NULL
-dt	desktop\source\migration				nmake	-	all	dt_migr dt_inc NULL
-dt	desktop\source\migration\services		nmake	-	all	dt_services dt_inc dt_dp_misc NULL
-dt	desktop\source\offacc					nmake	-	all	dt_offac dt_inc NULL
-dt	desktop\source\splash					nmake	-	all	dt_spl dt_migr dt_inc NULL
-dt	desktop\win32\source					nmake	-	w	dt_wrapper dt_inc NULL
-dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
-dt	desktop\win32\source\officeloader		nmake	-	w	dt_officeloader dt_inc NULL
-dt	desktop\win32\source\guiloader			nmake	-	w	dt_guiloader dt_wrapper.w dt_inc NULL
-dt  desktop\win32\source\guistdio           nmake   -   w   dt_guistdio dt_inc NULL
-dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
-dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
-dt	desktop\win32\source\QuickStart		nmake	-	w	dt_win32_quickstart NULL
-dt	desktop\win32\source\QuickStart\so	nmake	-	w	dt_win32_quickstart_so dt_win32_quickstart.w NULL
-dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
-dt     desktop\unx\source                      nmake   -       u       dt_uwrapper dt_pagein.u dt_inc NULL
-dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
-dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
-dt     desktop\unx\splash                      nmake   -       u       dt_usplash      dt_pagein.u dt_inc NULL
-dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_unopkg dt_inc dt_dp_misc NULL
-dt	desktop\source\deployment\misc				nmake	-	all	dt_dp_misc dt_inc NULL
-dt	desktop\source\deployment\unopkg			nmake	-	all	dt_dp_unopkg dt_inc NULL
-dt	desktop\source\deployment\gui				nmake	-	all	dt_dp_gui dt_dp_misc dt_inc NULL
-dt	desktop\source\deployment\manager			nmake	-	all	dt_dp_manager dt_inc NULL
-dt	desktop\source\deployment\registry			nmake	-	all	dt_dp_registry dt_inc NULL
-dt	desktop\source\deployment\registry\package		nmake	-	all	dt_dp_registry_package dt_inc NULL
-dt	desktop\source\deployment\registry\script		nmake	-	all	dt_dp_registry_script dt_inc NULL
-dt	desktop\source\deployment\registry\sfwk		nmake	-	all	dt_dp_registry_sfwk dt_inc NULL
-dt	desktop\source\deployment\registry\component		nmake	-	all	dt_dp_registry_component dt_inc NULL
-dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_configuration dt_inc NULL
-dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
-dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
-dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
-dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_win32_quickstart_so.w dt_zipintro NULL
-dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
-dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
-dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
-dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
-dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
+dt	desktop\prj						nmake	-	all	dt_prj NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 15ce1e885f79..e69de29bb2d1 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -1,146 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\bin\so
-mkdir: %_DEST%\bin\c01
-mkdir: %_DEST%\bin\c05
-mkdir: %_DEST%\bin\c08
-mkdir: %_DEST%\bin\odf4ms
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\soffice.bin %_DEST%\bin\soffice.bin
-..\%__SRC%\bin\officeloader.exe %_DEST%\bin\soffice.exe
-..\%__SRC%\bin\soffice %_DEST%\bin\soffice.bin
-..\%__SRC%\bin\soffice_mac %_DEST%\bin\soffice
-..\%__SRC%\bin\oosplash %_DEST%\bin\oosplash.bin
-..\%__SRC%\bin\so\soffice.bin %_DEST%\bin\so\soffice.bin
-..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin\so\soffice.exe
-..\%__SRC%\bin\so\soffice %_DEST%\bin\so\soffice.bin
-..\%__SRC%\bin\so\soffice_mac %_DEST%\bin\so\soffice
-..\%__SRC%\bin\sofficea*.dll %_DEST%\bin\sofficea*.dll
-..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib\isofficeapp.lib
-..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib\libsofficeapp.dylib
-..\%__SRC%\lib\libsofficeapp.so %_DEST%\lib\libsofficeapp.so
-
-..\%__SRC%\bin\soffice_oo.exe %_DEST%\bin\soffice_oo.exe
-..\%__SRC%\bin\soffice_oo %_DEST%\bin\soffice_oo.bin
-..\%__SRC%\bin\so\soffice_so.exe %_DEST%\bin\so\soffice_so.exe
-..\%__SRC%\bin\so\soffice_so %_DEST%\bin\so\soffice_so.bin
-
-..\%__SRC%\bin\scalc.exe %_DEST%\bin\scalc.exe
-..\%__SRC%\bin\sdraw.exe %_DEST%\bin\sdraw.exe
-..\%__SRC%\bin\simpress.exe %_DEST%\bin\simpress.exe
-..\%__SRC%\bin\smath.exe %_DEST%\bin\smath.exe
-..\%__SRC%\bin\swriter.exe %_DEST%\bin\swriter.exe
-..\%__SRC%\bin\sbase.exe %_DEST%\bin\sbase.exe
-..\%__SRC%\bin\sweb.exe %_DEST%\bin\sweb.exe
-..\%__SRC%\bin\os2quickstart.exe %_DEST%\bin\quickstart.exe
-..\%__SRC%\bin\so\scalc.exe %_DEST%\bin\so\scalc.exe
-..\%__SRC%\bin\so\sdraw.exe %_DEST%\bin\so\sdraw.exe
-..\%__SRC%\bin\so\simpress.exe %_DEST%\bin\so\simpress.exe
-..\%__SRC%\bin\so\smath.exe %_DEST%\bin\so\smath.exe
-..\%__SRC%\bin\so\swriter.exe %_DEST%\bin\so\swriter.exe
-..\%__SRC%\bin\so\sbase.exe %_DEST%\bin\so\sbase.exe
-..\%__SRC%\bin\so\sweb.exe %_DEST%\bin\so\sweb.exe
-
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin\quickstart.exe
-..\%__SRC%\bin\quickstart.exe %_DEST%\bin\install_quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\quickstart.exe
-..\%__SRC%\bin\soquickstart.exe %_DEST%\bin\so\install_quickstart.exe
-
-..\%__SRC%\misc\soffice.exe.manifest %_DEST%\bin\soffice.exe.manifest
-..\%__SRC%\misc\soffice.bin.manifest %_DEST%\bin\soffice.bin.manifest
-..\%__SRC%\bin\wrp*.dll %_DEST%\bin\wrp*.dll
-..\%__SRC%\bin\spl*.dll %_DEST%\bin\spl*.dll
-..\%__SRC%\obj\officeloader.obj %_DEST%\lib\officeloader.obj
-..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib\extendloaderenvironment.obj
-..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib\copyright_ascii_sun.obj
-..\%__SRC%\obj\main.obj %_DEST%\lib\main.obj
-..\%__SRC%\lib\libwrp*.so %_DEST%\lib\libwrp*.so
-..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib\libwrp*.dylib
-..\%__SRC%\lib\libspl*.so %_DEST%\lib\libspl*.so
-..\%__SRC%\lib\libspl*.dylib %_DEST%\lib\libspl*.dylib
-..\%__SRC%\bin\offacc*.dll %_DEST%\bin\offacc*.dll
-..\%__SRC%\lib\liboffacc*.so %_DEST%\lib\liboffacc*.so
-..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib\liboffacc*.dylib
-..\%__SRC%\bin\migratio*.dll %_DEST%\bin\migratio*.dll
-..\%__SRC%\lib\migratio*.uno.so %_DEST%\lib\migratio*.uno.so
-..\%__SRC%\lib\migratio*.uno.dylib %_DEST%\lib\migratio*.uno.dylib
-
-..\%__SRC%\bin\sweb %_DEST%\bin\sweb.bin
-
-..\%__SRC%\bin\loader2.ex? %_DEST%\bin\loader2.ex?
-
-..\%__SRC%\bin\depl*.dll %_DEST%\bin\depl*.dll
-..\%__SRC%\lib\deployment*.uno.so %_DEST%\lib\deployment*.uno.so
-..\%__SRC%\lib\deployment*.uno.dylib %_DEST%\lib\deployment*.uno.dylib
-..\%__SRC%\bin\deploymentmisc*.dll %_DEST%\bin\deploymentmisc*.dll
-..\%__SRC%\lib\libdeploymentmisc*.so %_DEST%\lib\libdeploymentmisc*.so
-..\%__SRC%\lib\libdeploymentmisc*.dylib %_DEST%\lib\libdeploymentmisc*.dylib
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin\unopkg.exe
-..\%__SRC%\bin\so\guiloader.exe %_DEST%\bin\so\unopkg.exe
-..\%__SRC%\bin\unopkg %_DEST%\bin\unopkg.bin
-..\%__SRC%\bin\so\unopkg %_DEST%\bin\so\unopkg.bin
-..\%__SRC%\bin\unopkg.exe %_DEST%\bin\unopkg.bin
-..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin\so\unopkg.bin
-..\%__SRC%\misc\unopkg.sh %_DEST%\bin\unopkg
-..\%__SRC%\bin\unopkga*.dll %_DEST%\bin\unopkga*.dll
-..\%__SRC%\lib\libunopkgapp.dylib %_DEST%\lib\libunopkgapp.dylib
-..\%__SRC%\lib\libunopkgapp.so %_DEST%\lib\libunopkgapp.so
-
-..\%__SRC%\bin\pagein %_DEST%\bin\pagein
-..\%__SRC%\misc\pagein-* %_DEST%\bin\pagein-*
-
-..\%__SRC%\bin\unoinfo.exe %_DEST%\bin\unoinfo.exe
-..\%__SRC%\misc\unoinfo.sh %_DEST%\bin\unoinfo
-
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-
-..\%__SRC%\misc\soffice.sh %_DEST%\bin\soffice
-..\%__SRC%\misc\sbase.sh %_DEST%\bin\sbase
-..\%__SRC%\misc\scalc.sh %_DEST%\bin\scalc
-..\%__SRC%\misc\sdraw.sh %_DEST%\bin\sdraw
-..\%__SRC%\misc\simpress.sh %_DEST%\bin\simpress
-..\%__SRC%\misc\smaster.sh %_DEST%\bin\smaster
-..\%__SRC%\misc\smath.sh %_DEST%\bin\smath
-..\%__SRC%\misc\sweb.sh %_DEST%\bin\sweb
-..\%__SRC%\misc\swriter.sh %_DEST%\bin\swriter
-..\%__SRC%\misc\nswrapper.sh %_DEST%\bin\nswrapper
-..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin\mozwrapper
-..\%__SRC%\misc\gdbtrace %_DEST%\bin\gdbtrace
-
-mkdir: %COMMON_DEST%\pck\brand
-mkdir: %COMMON_DEST%\pck\brand_dev
-
-..\%__SRC%\bin\intro.zip %COMMON_DEST%\pck\intro.zip
-..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck\brand\intro.zip
-..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck\brand_dev\intro.zip
-..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck\shell.zip
-
-..\%__SRC%\bin\guiloader.exe %_DEST%\bin\testtool.exe
-
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin\guistdio.com
-..\%__SRC%\bin\guistdio.exe %_DEST%\bin\crashrep.com
-..\%__SRC%\bin\unopkgio.exe %_DEST%\bin\unopkg.com
-
-..\scripts\ure-link %_DEST%\bin\ure-link
-..\scripts\basis-link %_DEST%\bin\basis-link
-..\scripts\basis-link %_DEST%\bin\c01\basis-link
-..\scripts\basis-link %_DEST%\bin\c05\basis-link
-..\scripts\basis-link %_DEST%\bin\c08\basis-link
-..\scripts\so-basis-link %_DEST%\bin\so\basis-link
-..\scripts\odf-basis-link %_DEST%\bin\odf4ms\basis-link
-
-mkdir: %_DEST%\xml\registry\spool
-mkdir: %_DEST%\xml\registry\spool\org
-mkdir: %_DEST%\xml\registry\spool\org\openoffice
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-..\%__SRC%\misc\deployment.component %_DEST%\xml\deployment.component
-..\%__SRC%\misc\deploymentgui.component %_DEST%\xml\deploymentgui.component
-..\%__SRC%\misc\migrationoo2.component %_DEST%\xml\migrationoo2.component
-..\%__SRC%\misc\migrationoo3.component %_DEST%\xml\migrationoo3.component
-..\%__SRC%\misc\offacc.component %_DEST%\xml\offacc.component
-..\%__SRC%\misc\spl.component %_DEST%\xml\spl.component
-..\%__SRC%\misc\splash.component %_DEST%\xml\splash.component
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/prj/makefile.mk
index 64fe173f4597..ffd9fb276d8a 100755
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/prj/makefile.mk
@@ -25,20 +25,16 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-
-PRJNAME = desktop
-TARGET = deployment_unopkg
-ENABLE_EXCEPTIONS = TRUE
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
 
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    unopkg.src
-
-SLOFILES = 
-
-.INCLUDE : ..$/target.pmk
-.INCLUDE : target.mk
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
deleted file mode 100755
index 55354f9d325c..000000000000
--- a/desktop/scripts/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=desktop
-TARGET=scripts
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets -------------------------------------------------------------
-
-UNIXTEXT= \
-    $(MISC)$/sbase.sh \
-    $(MISC)$/scalc.sh \
-    $(MISC)$/sdraw.sh \
-    $(MISC)$/simpress.sh \
-    $(MISC)$/smaster.sh \
-    $(MISC)$/smath.sh \
-    $(MISC)$/sweb.sh \
-    $(MISC)$/swriter.sh \
-    $(MISC)$/mozwrapper.sh \
-    $(MISC)$/unoinfo.sh \
-    $(MISC)$/unopkg.sh \
-    $(MISC)$/gdbtrace
-
-.IF "$(OS)" != "MACOSX"
-
-UNIXTEXT+= $(MISC)$/soffice.sh
-
-.ENDIF
-
-.INCLUDE :  target.mk
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index 727095d1b2c6..28ee88964b09 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -174,4 +174,4 @@ if test "$#" -eq 1; then
 fi
 
 # oosplash does the rest: forcing pages in, javaldx etc. are
-exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash.bin" "$@"
+exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index 88610ba18ef9..b24d8187884c 100755
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-
 #include "sal/main.h"
 
 #include "sofficemain.h"
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
deleted file mode 100755
index f905bd6ea296..000000000000
--- a/desktop/source/app/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=desktop
-TARGET=dkt
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : ../deployment/inc/dp_misc.mk
-
-.IF "$(ENABLE_GNOMEVFS)"=="TRUE"
-CFLAGS+=-DGNOME_VFS_ENABLED
-.ENDIF
-
-# .IF "$(OS)" == "WNT"
-# .IF "$(COM)" == "GCC"
-# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
-# .ELSE
-# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
-# .ENDIF
-# .ELSE
-# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
-# .ENDIF
-
-.IF "$(GUI)"=="WNT" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-
-SHL1TARGET = sofficeapp
-SHL1OBJS = \
-    $(SLO)$/app.obj \
-    $(SLO)$/appfirststart.obj \
-    $(SLO)$/appinit.obj \
-    $(SLO)$/appsys.obj \
-    $(SLO)$/check_ext_deps.obj \
-    $(SLO)$/cmdlineargs.obj \
-    $(SLO)$/cmdlinehelp.obj \
-    $(SLO)$/configinit.obj \
-    $(SLO)$/desktopcontext.obj \
-    $(SLO)$/desktopresid.obj \
-    $(SLO)$/dispatchwatcher.obj \
-    $(SLO)$/langselect.obj \
-    $(SLO)$/lockfile.obj \
-    $(SLO)$/lockfile2.obj \
-    $(SLO)$/officeipcthread.obj \
-    $(SLO)$/sofficemain.obj \
-    $(SLO)$/userinstall.obj
-
-SHL1LIBS = $(SLB)$/mig.lib
-
-SHL1STDLIBS = \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(DEPLOYMENTMISCLIB) \
-    $(I18NISOLANGLIB) \
-    $(SALLIB) \
-    $(SFXLIB) \
-    $(SVLLIB) \
-    $(SVTOOLLIB) \
-    $(TKLIB) \
-    $(TOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(UNOTOOLSLIB) \
-    $(VCLLIB) \
-
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-OBJFILES = \
-    $(OBJ)$/copyright_ascii_ooo.obj \
-    $(OBJ)$/main.obj \
-    $(OBJ)$/copyright_ascii_sun.obj
-
-SLOFILES = $(SHL1OBJS)
-
-SRS1NAME=	desktop
-SRC1FILES=	desktop.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 14c044e82a23..4d093b9122f2 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -29,6 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
+#include "desktopdllapi.h"
+
 #include "app.hxx"
 #include "cmdlineargs.hxx"
 #include "cmdlinehelp.hxx"
@@ -40,7 +42,7 @@ int SVMain();
 
 // -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-extern "C" int soffice_main()
+extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 {
     tools::extendApplicationEnvironment();
 
diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index 539988834a02..bbe86d54e2bc 100755
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
@@ -29,13 +29,13 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H
 #define INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H
 
-#include "sal/config.h"
+#include "desktopdllapi.h"
 
 #if defined __cplusplus
 extern "C" {
 #endif
 
-int soffice_main(void);
+int DESKTOP_DLLPUBLIC soffice_main(void);
 
 #if defined __cplusplus
 }
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
deleted file mode 100755
index eed15ac25be7..000000000000
--- a/desktop/source/deployment/gui/makefile.mk
+++ /dev/null
@@ -1,109 +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 = desktop
-TARGET = deploymentgui
-ENABLE_EXCEPTIONS = TRUE
-NO_BSYMBOLIC = TRUE
-USE_PCH :=
-ENABLE_PCH :=
-PRJINC:=..$/..
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-DLLPRE =
-
-SLOFILES = \
-        $(SLO)$/dp_gui_service.obj \
-        $(SLO)$/dp_gui_extlistbox.obj \
-        $(SLO)$/dp_gui_dialog2.obj \
-        $(SLO)$/dp_gui_theextmgr.obj \
-        $(SLO)$/license_dialog.obj \
-        $(SLO)$/dp_gui_dependencydialog.obj \
-        $(SLO)$/dp_gui_thread.obj \
-        $(SLO)$/dp_gui_updatedialog.obj \
-        $(SLO)$/dp_gui_updateinstalldialog.obj \
-        $(SLO)$/dp_gui_autoscrolledit.obj \
-        $(SLO)$/dp_gui_extensioncmdqueue.obj \
-        $(SLO)$/descedit.obj
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL1STDLIBS = \
-        $(SALLIB) \
-        $(SALHELPERLIB) \
-        $(CPPULIB) \
-        $(CPPUHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(COMPHELPERLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVTOOLLIB)	\
-        $(SVLLIB)  \
-        $(SVXLIB) \
-        $(SVXCORELIB) \
-        $(SFXLIB) \
-        $(DEPLOYMENTMISCLIB) \
-        $(OLE32LIB)
-
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-        dp_gui_dialog.src \
-        dp_gui_dialog2.src \
-        dp_gui_backend.src \
-        dp_gui_dependencydialog.src \
-        dp_gui_updatedialog.src \
-        dp_gui_versionboxes.src \
-        dp_gui_updateinstalldialog.src
-
-RESLIB1NAME = $(TARGET)
-RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs
-RESLIB1IMAGES=	$(PRJ)$/res
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/deploymentgui.component
-
-$(MISC)/deploymentgui.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
deleted file mode 100755
index bffc8241c300..000000000000
--- a/desktop/source/deployment/makefile.mk
+++ /dev/null
@@ -1,109 +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 = desktop
-TARGET = deployment
-ENABLE_EXCEPTIONS = TRUE
-NO_BSYMBOLIC = TRUE
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
- 
-INCPRE += inc
-
-DLLPRE =
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL1LIBS = \
-    $(SLB)$/deployment_manager.lib \
-    $(SLB)$/deployment_registry.lib \
-    $(SLB)$/deployment_registry_executable.lib \
-    $(SLB)$/deployment_registry_component.lib \
-    $(SLB)$/deployment_registry_configuration.lib \
-    $(SLB)$/deployment_registry_package.lib \
-    $(SLB)$/deployment_registry_script.lib \
-    $(SLB)$/deployment_registry_sfwk.lib \
-    $(SLB)$/deployment_registry_help.lib
-
-SHL1OBJS = \
-    $(SLO)$/dp_log.obj \
-    $(SLO)$/dp_persmap.obj \
-    $(SLO)$/dp_services.obj \
-    $(SLO)$/dp_xml.obj
-
-SHL1STDLIBS = \
-        $(SALLIB) \
-        $(CPPULIB) \
-        $(CPPUHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(COMPHELPERLIB) \
-        $(TOOLSLIB) \
-        $(XMLSCRIPTLIB) \
-        $(SVLLIB) \
-        $(UNOTOOLSLIB) \
-        $(DEPLOYMENTMISCLIB) \
-    $(HELPLINKERLIB)
-
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(LIB1OBJFILES)
-
-RESLIB1NAME = $(TARGET)
-
-RESLIB1SRSFILES = \
-        $(SRS)$/deployment_registry_configuration.srs \
-        $(SRS)$/deployment_registry_component.srs \
-        $(SRS)$/deployment_registry_script.srs \
-        $(SRS)$/deployment_registry_sfwk.srs \
-        $(SRS)$/deployment_registry_package.srs \
-        $(SRS)$/deployment_registry_help.srs \
-        $(SRS)$/deployment_registry.srs \
-        $(SRS)$/deployment_manager.srs \
-    $(SRS)$/deployment_unopkg.srs
-
-RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/deployment.component
-
-$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        deployment.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt deployment.component
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
deleted file mode 100755
index 022f5e27e554..000000000000
--- a/desktop/source/deployment/manager/makefile.mk
+++ /dev/null
@@ -1,53 +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 = desktop
-TARGET = deployment_manager
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    dp_manager.src
-
-SLOFILES = \
-        $(SLO)$/dp_activepackages.obj \
-        $(SLO)$/dp_manager.obj \
-        $(SLO)$/dp_managerfac.obj \
-        $(SLO)$/dp_informationprovider.obj \
-        $(SLO)$/dp_extensionmanager.obj \
-        $(SLO)$/dp_commandenvironments.obj \
-        $(SLO)$/dp_properties.obj
-
-.INCLUDE : ..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
deleted file mode 100755
index 9c0b33d36698..000000000000
--- a/desktop/source/deployment/misc/makefile.mk
+++ /dev/null
@@ -1,78 +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 = desktop
-TARGET = deployment_misc
-USE_DEFFILE = TRUE
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.INCLUDE : settings.mk
-
-# Reduction of exported symbols:
-CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    dp_misc.src
-
-SHL1TARGET = deploymentmisc$(DLLPOSTFIX)
-SHL1OBJS = \
-        $(SLO)$/dp_misc.obj \
-        $(SLO)$/dp_resource.obj \
-        $(SLO)$/dp_identifier.obj \
-        $(SLO)$/dp_interact.obj \
-        $(SLO)$/dp_ucb.obj \
-        $(SLO)$/db.obj \
-        $(SLO)$/dp_version.obj \
-        $(SLO)$/dp_descriptioninfoset.obj \
-        $(SLO)$/dp_dependencies.obj \
-        $(SLO)$/dp_platform.obj \
-        $(SLO)$/dp_update.obj
-        
-SHL1STDLIBS = \
-    $(BERKELEYLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB) \
-    $(TOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(UNOTOOLSLIB) \
-    $(XMLSCRIPTLIB) \
-    $(COMPHELPERLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE : ..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk
deleted file mode 100755
index b7ee5c203cd5..000000000000
--- a/desktop/source/deployment/registry/component/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 = desktop
-TARGET = deployment_registry_component
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-        dp_component.src
-
-INCPRE += ..$/..$/inc
-
-SLOFILES = \
-        $(SLO)$/dp_component.obj \
-        $(SLO)$/dp_compbackenddb.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
deleted file mode 100755
index 1fb637ef8e3a..000000000000
--- a/desktop/source/deployment/registry/configuration/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 = desktop
-TARGET = deployment_registry_configuration
-ENABLE_EXCEPTIONS = TRUE
-
-INCPRE += ..$/..$/inc
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-        dp_configuration.src
-
-SLOFILES = \
-        $(SLO)$/dp_configuration.obj \
-        $(SLO)$/dp_configurationbackenddb.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk
deleted file mode 100755
index 81b2baa44e5d..000000000000
--- a/desktop/source/deployment/registry/executable/makefile.mk
+++ /dev/null
@@ -1,44 +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 = desktop
-TARGET = deployment_registry_executable
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-
-INCPRE += ..$/..$/inc
-
-SLOFILES = \
-        $(SLO)$/dp_executable.obj \
-        $(SLO)$/dp_executablebackenddb.obj
-        
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
deleted file mode 100755
index 81778bf728c0..000000000000
--- a/desktop/source/deployment/registry/help/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 = desktop
-TARGET = deployment_registry_help
-ENABLE_EXCEPTIONS = TRUE
-
-INCPRE += ..$/..$/inc
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-        dp_help.src
-
-SLOFILES = \
-        $(SLO)$/dp_help.obj \
-        $(SLO)$/dp_helpbackenddb.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk
deleted file mode 100755
index e45cec272ca7..000000000000
--- a/desktop/source/deployment/registry/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 = desktop
-TARGET = deployment_registry
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    dp_registry.src
-
-INCPRE += inc
-
-SLOFILES = \
-        $(SLO)$/dp_backend.obj \
-        $(SLO)$/dp_registry.obj \
-        $(SLO)$/dp_backenddb.obj
-
-.INCLUDE : ..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk
deleted file mode 100755
index 708def358021..000000000000
--- a/desktop/source/deployment/registry/script/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 = desktop
-TARGET = deployment_registry_script
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-
-SRS1NAME = $(TARGET)
-SRC1FILES = \
-    dp_script.src
-
-INCPRE += ..$/..$/inc
-
-SLOFILES = \
-        $(SLO)$/dp_script.obj \
-        $(SLO)$/dp_lib_container.obj \
-        $(SLO)$/dp_scriptbackenddb.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk
deleted file mode 100755
index a052296d5c21..000000000000
--- a/desktop/source/deployment/registry/sfwk/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 = desktop
-TARGET = deployment_registry_sfwk
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-SRS1NAME = $(TARGET)
-
-SRC1FILES = \
-        dp_sfwk.src
-
-INCPRE += ..$/..$/inc
-
-SLOFILES = \
-        $(SLO)$/dp_parceldesc.obj \
-        $(SLO)$/dp_sfwk.obj
-
-.INCLUDE : ..$/..$/target.pmk
-.INCLUDE : target.mk
-
diff --git a/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk
deleted file mode 100755
index 82b41766b253..000000000000
--- a/desktop/source/deployment/target.pmk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(debug)" != ""
-
-# MSVC: no inlining
-.IF "$(COM)" == "MSC"
-CFLAGS += /Ob0
-.ENDIF
-
-.ENDIF
-
diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h
new file mode 100644
index 000000000000..a97f4d429a04
--- /dev/null
+++ b/desktop/source/inc/desktopdllapi.h
@@ -0,0 +1,41 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+ */
+
+#ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H
+
+#include <sal/config.h>
+#include <sal/types.h>
+
+#if defined(DESKTOP_DLLIMPLEMENTATION)
+#   define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#   define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim: set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
deleted file mode 100755
index b20b4c57974f..000000000000
--- a/desktop/source/migration/makefile.mk
+++ /dev/null
@@ -1,52 +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=desktop
-TARGET=mig
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-RSCEXTINC=..$/app
-
-# hacky - is no define
-CDEFS+=-I..$/app
-CDEFS+=-I$(PRJ)/inc
-
-SLOFILES = \
-        $(SLO)$/migration.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
deleted file mode 100755
index f74dec646b1d..000000000000
--- a/desktop/source/migration/services/makefile.mk
+++ /dev/null
@@ -1,131 +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=desktop
-TARGET = migrationoo2.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = migrationoo2
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  cppumaker.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-SLOFILES= \
-        $(SLO)$/jvmfwk.obj \
-        $(SLO)$/cexports.obj \
-        $(SLO)$/basicmigration.obj \
-        $(SLO)$/wordbookmigration.obj \
-        $(SLO)$/autocorrmigration.obj \
-        $(SLO)$/oo3extensionmigration.obj \
-        $(SLO)$/cexportsoo3.obj
-
-SHL1OBJS= \
-        $(SLO)$/jvmfwk.obj \
-        $(SLO)$/cexports.obj \
-        $(SLO)$/basicmigration.obj \
-        $(SLO)$/wordbookmigration.obj \
-        $(SLO)$/autocorrmigration.obj
-
-SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-    $(DEPLOYMENTMISCLIB) \
-    $(CPPULIB)		\
-    $(CPPUHELPERLIB)	\
-    $(SALLIB) \
-    $(UCBHELPERLIB)	\
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB)	\
-    $(I18NISOLANGLIB) \
-    $(JVMFWKLIB) \
-    $(XMLSCRIPTLIB) \
-    $(BERKELEYLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=imigrationoo2
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-
-COMP2TYPELIST = migrationoo3
-SHL2TARGET=migrationoo3.uno
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL2OBJS= \
-        $(SLO)$/cexportsoo3.obj \
-        $(SLO)$/oo3extensionmigration.obj
-
-SHL2STDLIBS= \
-    $(DEPLOYMENTMISCLIB) \
-    $(CPPULIB)		\
-    $(CPPUHELPERLIB)	\
-    $(SALLIB) \
-    $(UCBHELPERLIB)	\
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB)	\
-    $(I18NISOLANGLIB) \
-    $(JVMFWKLIB) \
-    $(XMLSCRIPTLIB) \
-    $(BERKELEYLIB)
-
-SHL2DEPN=
-SHL2IMPLIB=imigrationoo3
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=$(SHL2TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/migrationoo3.component
-
-$(MISC)/migrationoo3.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
-
-ALLTAR : $(MISC)/migrationoo2.component
-
-$(MISC)/migrationoo2.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component
diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
deleted file mode 100755
index 809c28414bef..000000000000
--- a/desktop/source/offacc/makefile.mk
+++ /dev/null
@@ -1,70 +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=desktop
-TARGET=offacc
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/acceptor.obj
-
-SHL1DEPN=	makefile.mk
-SHL1OBJS=	$(SLOFILES)
-
-SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS=	\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/offacc.component
-
-$(MISC)/offacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        offacc.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt offacc.component
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
deleted file mode 100755
index 1125e45b1a41..000000000000
--- a/desktop/source/pagein/makefile.mk
+++ /dev/null
@@ -1,169 +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=desktop
-TARGET=pagein
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE .IGNORE : icuversion.mk
-
-# --- Targets ------------------------------------------------------
-
-ALL: \
-    $(MISC)$/$(TARGET)-calc    \
-    $(MISC)$/$(TARGET)-draw    \
-    $(MISC)$/$(TARGET)-impress \
-    $(MISC)$/$(TARGET)-writer  \
-    $(MISC)$/$(TARGET)-common  \
-    ALLTAR
-
-.INCLUDE :  target.mk
-
-ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
-UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
-UNODLLPOST=.uno$(DLLPOST)
-DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default 
-
-URELIBPATH=..$/ure-link$/lib
-UREMISCPATH=..$/ure-link$/share$/misc
-
-$(MISC)$/$(TARGET)-calc : makefile.mk
-    @echo Making: $@
-    @-echo $(DLLPRE)sc$(DFTDLLPOST)  >  $@
-    @-echo $(DLLPRE)scui$(DFTDLLPOST) >>  $@
-    @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-    @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@
-
-$(MISC)$/$(TARGET)-draw : makefile.mk
-    @echo Making: $@
-    @-echo $(DLLPRE)sd$(DFTDLLPOST)  >  $@
-    @-echo $(DLLPRE)sdui$(DFTDLLPOST) >>  $@
-    @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-    @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@
-
-$(MISC)$/$(TARGET)-impress : makefile.mk
-    @echo Making: $@
-    @-echo $(DLLPRE)sd$(DFTDLLPOST)  >  $@
-    @-echo $(DLLPRE)sdui$(DFTDLLPOST) >>  $@
-    @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-    @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@
-
-$(MISC)$/$(TARGET)-writer : makefile.mk
-    @echo Making: $@
-    @-echo $(DLLPRE)sw$(DFTDLLPOST)  >  $@
-    @-echo $(DLLPRE)swui$(DFTDLLPOST) >>  $@
-    @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-    @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@
-
-# sorted in approx. reverse load order (ld.so.1)
-$(MISC)$/$(TARGET)-common : makefile.mk
-    @echo Making: $@
-    @-echo i18npool$(UNODLLPOST)         >  $@
-.IF "$(SYSTEM_ICU)" != "YES"
-    @-echo $(DLLPRE)icui18n$(ICUDLLPOST) >> $@
-    @-echo $(DLLPRE)icule$(ICUDLLPOST)   >> $@
-    @-echo $(DLLPRE)icuuc$(ICUDLLPOST)   >> $@
-#   @-echo $(DLLPRE)icudata$(ICUDLLPOST) >> $@ - a huge dll, almost none of it used
-.ENDIF # SYSTEM_ICU
-#
-    @-echo $(DLLPRE)lng$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)xo$(DFTDLLPOST)    >> $@
-#
-
-    @-echo $(DLLPRE)fwe$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)fwk$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)fwi$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)fwl$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)package2$(DLLPOST) >> $@
-    @-echo $(DLLPRE)ucpfile1$(DLLPOST) >> $@
-    @-echo $(DLLPRE)ucb1$(DLLPOST)     >> $@
-    @-echo configmgr$(UNODLLPOST)      >> $@
-#
-    @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@
-.IF "$(ENABLE_GTK)" != ""
-    @-echo $(DLLPRE)vclplug_gtk$(DFTDLLPOST) >> $@
-.ENDIF # ENABLE_GTK
-.IF "$(ENABLE_KDE)" != ""
-    @-echo $(DLLPRE)vclplug_kde$(DFTDLLPOST) >> $@
-.ENDIF # ENABLE_KDE
-#
-    @-echo $(DLLPRE)basegfx$(DFTDLLPOST) >> $@
-    @-echo $(DLLPRE)sot$(DFTDLLPOST)     >> $@
-    @-echo $(DLLPRE)xcr$(DFTDLLPOST)     >> $@
-    @-echo $(DLLPRE)sb$(DFTDLLPOST)      >> $@
-#
-# uno runtime environment
-#
-    @-echo $(URELIBPATH)$/stocservices$(UNODLLPOST)         >> $@
-    @-echo $(URELIBPATH)$/bootstrap$(UNODLLPOST)            >> $@
-    @-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST)         >> $@
-    @-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST)       >> $@
-    @-echo $(URELIBPATH)$/reflection$(UNODLLPOST)           >> $@
-    @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
-    @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST)               >> $@
-    @-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST)                >> $@
-#
-    @-echo $(DLLPRE)ucbhelper$(UCBHELPER_MAJOR)$(COMID)$(DLLPOST) >> $@
-    @-echo $(DLLPRE)comphelp$(COMPHLP_MAJOR)$(COMID)$(DLLPOST)    >> $@
-    @-echo $(DLLPRE)tl$(DFTDLLPOST)    >> $@
-    @-echo $(DLLPRE)utl$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)svl$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)vcl$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)tk$(DFTDLLPOST)    >> $@
-    @-echo $(UREMISCPATH)$/types.rdb   >> $@
-    @-echo services.rdb                >> $@
-    @-echo oovbaapi.rdb                          >> $@
-    @-echo deployment$(DLLPOSTFIX)$(UNODLLPOST)  >> $@
-    @-echo $(DLLPRE)deploymentmisc$(DFTDLLPOST)  >> $@
-    @-echo $(DLLPRE)ucb1$(DLLPOST)               >> $@
-    @-echo $(DLLPRE)xstor$(DLLPOST)              >> $@
-    @-echo $(DLLPRE)package2$(DLLPOST)           >> $@
-    @-echo $(DLLPRE)filterconfig1$(DLLPOST)      >> $@
-    @-echo $(DLLPRE)uui$(DFTDLLPOST)             >> $@
-    @-echo $(DLLPRE)lng$(DFTDLLPOST)             >> $@
-    @-echo $(DLLPRE)svt$(DFTDLLPOST)             >> $@
-    @-echo $(DLLPRE)spl$(DFTDLLPOST)             >> $@
-    @-echo $(DLLPRE)basegfx$(DFTDLLPOST)         >> $@
-    @-echo $(DLLPRE)avmedia$(DFTDLLPOST)         >> $@
-    @-echo $(DLLPRE)helplinker$(DFTDLLPOST)      >> $@
-    @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST)     >> $@
-    @-echo $(DLLPRE)icule$(ICUDLLPOST)           >> $@
-    @-echo sax$(UNODLLPOST)                      >> $@
-    @-echo gconfbe1$(UNODLLPOST)                 >> $@
-    @-echo fsstorage$(UNODLLPOST)                >> $@
-    @-echo desktopbe1$(UNODLLPOST)               >> $@
-    @-echo localebe1$(UNODLLPOST)                >> $@
-    @-echo ucpexpand1$(UNODLLPOST)               >> $@
-# stoc bits
-    @-echo $(DLLPRE)sfx$(DFTDLLPOST)             >> $@
-    @-echo $(DLLPRE)sofficeapp$(DLLPOST)         >> $@
-
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
deleted file mode 100755
index e96cf60f0f42..000000000000
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ /dev/null
@@ -1,98 +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 = desktop
-TARGET = unopkg
-TARGETTYPE = GUI
-ENABLE_EXCEPTIONS = TRUE
-LIBTARGET=NO
-
-PRJINC += ..$/..$/deployment ..$/..
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-.IF "$(LINK_SO)"!=""
-APP1TARGET = so$/unopkg
-APP1OBJS = $(OBJFILES)
-APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
-APP1DEPN = $(SHL1TARGETN)
-APP1NOSAL = TRUE
-APP1RPATH = BRAND
-.IF "$(OS)" == "WNT"
-APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico
-APP1LINKRES = $(MISC)$/$(TARGET)1.res
-.ENDIF
-.ENDIF			# "$(LINK_SO)"!=""
-
-APP2TARGET = unopkg
-APP2OBJS = $(OBJFILES)
-APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB)
-APP2DEPN = $(SHL1TARGETN)
-APP2NOSAL = TRUE
-APP2RPATH = BRAND
-.IF "$(OS)" == "WNT"
-APP2ICON = $(SOLARRESDIR)$/icons/ooo3_main_app.ico
-APP2LINKRES = $(MISC)$/$(TARGET)2.res
-.ENDIF
-
-SHL1TARGET = unopkgapp
-SHL1OBJS = $(SLOFILES) $(SLO)$/lockfile.obj
-SHL1STDLIBS = \
-    $(SALLIB) \
-    $(CPPULIB) \
-    $(CPPUHELPERLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(VCLLIB) \
-    $(DEPLOYMENTMISCLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = \
-    $(SLO)$/unopkg_app.obj \
-    $(SLO)$/unopkg_cmdenv.obj \
-    $(SLO)$/unopkg_misc.obj
-
-OBJFILES = $(OBJ)$/unopkg_main.obj
-
-.INCLUDE : target.mk
-
-.IF "$(APP1TARGETN)" != "" # not set during depend=x
-$(APP1TARGETN) : $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP1TARGETN)"!=""
-
-$(MISC)$/binso_created.flg:
-    @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@
-    @@-$(MKDIRHIER) $(MISC)$/so && $(TOUCH) $@
-
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 5411e40a91ca..82af6dc402e0 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 
+#include "desktopdllapi.h"
 #include "dp_misc.h"
 #include "unopkg_main.h"
 #include "unopkg_shared.h"
@@ -222,7 +223,7 @@ void disposeBridges(Reference<css::uno::XComponentContext> ctx)
     }
 }
 
-extern "C" int unopkg_main()
+extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
 {
     tools::extendApplicationEnvironment();
     DisposeGuard disposeGuard;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c
index 07e310c3b402..6f3d5d3b9a93 100755
--- a/desktop/source/pkgchk/unopkg/unopkg_main.c
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.c
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include "sal/config.h"
-
 #include "sal/main.h"
 
 #include "unopkg_main.h"
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h
index a4d66cf17c05..3714e6fda445 100755
--- a/desktop/source/pkgchk/unopkg/unopkg_main.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.h
@@ -29,13 +29,13 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H
 #define INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H
 
-#include "sal/config.h"
+#include "desktopdllapi.h"
 
 #if defined __cplusplus
 extern "C" {
 #endif
 
-int unopkg_main(void);
+DESKTOP_DLLPUBLIC int unopkg_main(void);
 
 #if defined __cplusplus
 }
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
deleted file mode 100755
index 8db499d7c913..000000000000
--- a/desktop/source/splash/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=desktop
-TARGET=spl
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	$(SLO)$/splash.obj \
-            $(SLO)$/services_spl.obj
-
-SHL1DEPN=   makefile.mk
-SHL1OBJS=   $(SLOFILES) \
-            $(SLO)$/migration.obj
-
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-    $(VCLLIB)			\
-    $(SVLLIB)           \
-    $(SVTOOLLIB)        \
-    $(COMPHELPERLIB)    \
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(UCBHELPERLIB)     \
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)           \
-    $(SFXLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/spl.component
-
-$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        spl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt spl.component
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
deleted file mode 100755
index 7864dd8ad58b..000000000000
--- a/desktop/unx/source/makefile.mk
+++ /dev/null
@@ -1,78 +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
-#               Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jan Holesovsky <kendy@novell.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=desktop
-TARGET=oosplash
-
-NO_DEFAULT_STL=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)"=="MACOSX"
-dummy:
-    @echo "Not building oosplash.bin for Mac."
-
-.ELSE
-
-.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
-CFLAGS+=-DENABLE_QUICKSTART_LIBPNG
-CFLAGS+=$(LIBPNG_CFLAGS)
-.ENDIF
-.IF "$(USE_XINERAMA)"=="YES"
-CFLAGS+=-DUSE_XINERAMA
-.ENDIF
-
-STDLIB=
-
-OBJFILES= \
-    $(OBJ)$/splashx.obj \
-    $(OBJ)$/start.obj \
-    $(OBJ)$/args.obj \
-    $(OBJ)$/pagein.obj \
-    $(OBJ)$/file_image_unx.obj
-
-APP1TARGET = $(TARGET)
-APP1RPATH  = BRAND
-APP1OBJS   = $(OBJFILES) $(PAGEIN_OBJS)
-APP1LIBSALCPPRT=
-APP1CODETYPE = C
-APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB)
-.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
-APP1STDLIBS += $(LIBPNG_LIBS)
-.ENDIF
-.IF "$(USE_XINERAMA)"=="YES"
-APP1STDLIBS += -lXinerama
-.ENDIF
-.IF "$(OS)"=="SOLARIS"
-APP1STDLIBS+= -lsocket
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/unx/source/officeloader/makefile.mk b/desktop/unx/source/officeloader/makefile.mk
deleted file mode 100755
index 050da981e88d..000000000000
--- a/desktop/unx/source/officeloader/makefile.mk
+++ /dev/null
@@ -1,47 +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=desktop
-TARGET=officeloader
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-        $(OBJ)$/officeloader.obj
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
deleted file mode 100755
index e338cfe36b83..000000000000
--- a/desktop/unx/splash/makefile.mk
+++ /dev/null
@@ -1,76 +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
-#               Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Jan Holesovsky <kendy@novell.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=desktop
-TARGET=spl_unx
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)"=="MACOSX"
-dummy:
-    @echo "Unix quickstarter disabled for mac"
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  $(SLO)$/unxsplash.obj
-
-SHL1DEPN=   makefile.mk
-SHL1OBJS=   $(SLOFILES)
-
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/splash.component
-
-$(MISC)/splash.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        splash.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt splash.component
-
-.ENDIF
\ No newline at end of file
diff --git a/desktop/util/Makefile b/desktop/util/Makefile
new file mode 100644
index 000000000000..4dc649efad34
--- /dev/null
+++ b/desktop/util/Makefile
@@ -0,0 +1,40 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+DESTDIR := $(WORKDIR)/CustomTarget/desktop/util
+
+$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.exe
+	mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@
+
+$(DESTDIR)/soffice.exe.manifest : $(DESTDIR)/linker.manifest template.manifest
+	mkdir -p $(DESTDIR) && mt.exe -manifest $^ -out:$@
+
+.DEFAULT_TARGET := all
+.PHONY : all
+all : $(DESTDIR)/soffice.exe.manifest
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
deleted file mode 100755
index 1c6fb2e0e46b..000000000000
--- a/desktop/util/makefile.mk
+++ /dev/null
@@ -1,233 +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=desktop
-TARGET=soffice
-TARGETTYPE=GUI
-LIBTARGET=NO
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-VERINFONAME=verinfo
-
-# --- Resourcen ----------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-RCFILES=verinfo.rc
-.ENDIF
-
-# --- Linken der Applikation ---------------------------------------
-
-.IF "$(OS)" == "MACOSX"
-LINKFLAGSAPPGUI!:=	$(LINKFLAGSAPPGUI:s/-bind_at_load//)
-.ENDIF # MACOSX
-
-RESLIB1NAME=		dkt
-RESLIB1IMAGES=		$(PRJ)$/res
-RESLIB1SRSFILES=	$(SRS)$/desktop.srs
-
-.IF "$(L10N_framework)"==""
-.IF "$(LINK_SO)"=="TRUE"
-APP1TARGET=so$/$(TARGET)
-APP1NOSAL=TRUE
-APP1RPATH=BRAND
-APP1OBJS=$(OBJ)$/copyright_ascii_sun.obj $(OBJ)$/main.obj
-APP1STDLIBS = $(SALLIB) $(SOFFICELIB)
-APP1DEPN= $(APP1RES) verinfo.rc
-
-.IF "$(GUI)" == "WNT"
-APP1RES=    $(RES)$/desktop.res
-APP1ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP1VERINFO=verinfo.rc
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1STACK=10000000
-
-.ENDIF # WNT
-
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-APP5TARGET=soffice
-APP5NOSAL=TRUE
-APP5RPATH=BRAND
-APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
-APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
-.IF "$(OS)" == "LINUX"
-APP5STDLIBS+= -lXext -lX11
-.ENDIF # LINUX
-
-APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
-APP5DEF=    $(MISCX)$/$(TARGET).def
-
-.IF "$(GUI)" == "WNT"
-APP5RES=    $(RES)$/oodesktop.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
-APP5VERINFO=ooverinfo.rc
-APP5LINKRES=$(MISC)$/ooffice5.res
-APP5STACK=10000000
-.ENDIF # WNT
-
-.IF "$(GUI)" == "WNT"
-.IF "$(LINK_SO)"=="TRUE"
-APP6TARGET=so$/officeloader
-APP6RES=$(RES)$/soloader.res
-APP6NOSAL=TRUE
-APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6LINKRES=$(MISC)$/soffice6.res
-APP6ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP6OBJS = \
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/officeloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-APP7TARGET=officeloader
-APP7RES=$(RES)$/ooloader.res
-APP7NOSAL=TRUE
-APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc
-APP7VERINFO=ooverinfo.rc
-APP7LINKRES=$(MISC)$/ooffice7.res
-APP7ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
-APP7OBJS = \
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/officeloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB7=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
-.ELIF "$(OS)" == "MACOSX"
-APP6TARGET=officeloader
-APP6NOSAL=TRUE
-APP6RPATH=BRAND
-APP6OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/officeloader.obj
-APP6STDLIBS = $(SALLIB)
-APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
-APP5DEF=    $(MISCX)$/$(TARGET).def
-.ENDIF # WNT
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N_framework)"==""
-
-.IF "$(APP1TARGETN)"!=""
-$(APP1TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP1TARGETN)"!=""
-
-.IF "$(APP5TARGETN)"!=""
-$(APP5TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP6TARGETN)"!=""
-
-.IF "$(APP6TARGETN)"!=""
-$(APP6TARGETN) :  $(MISC)$/binso_created.flg
-.ENDIF			# "$(APP6TARGETN)"!=""
-
-.IF "$(GUI)" == "WNT"
-ALLTAR: $(MISC)$/$(TARGET).exe.manifest
-ALLTAR: $(MISC)$/$(TARGET).bin.manifest
-ALLTAR: $(BIN)$/$(TARGET).bin
-.IF "$(LINK_SO)"=="TRUE"
-ALLTAR: $(BIN)$/so$/$(TARGET).bin
-.ENDIF # "$(LINK_SO)"=="TRUE"
-.ENDIF # WNT
-
-$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
-    $(COPY) $< $@
-
-.IF "$(LINK_SO)"=="TRUE"
-$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
-    $(COPY) $< $@
-
-ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOST)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
-
-.IF "$(OS)" == "MACOSX"
-.IF "$(LINK_SO)"=="TRUE"
-$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
-    $(COPY) $< $@
-    
-ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-$(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN)
-    $(COPY) $< $@
-
-ALLTAR : $(BIN)$/soffice_mac$(EXECPOST)
-
-.ENDIF # "$(OS)" == "MACOSX"
-
-.IF "$(GUI)" == "WNT"
-
-# create a manifest file with the same name as the
-# office executable file soffice.exe.manifest
-.IF "$(CCNUMVER)" <= "001399999999"
-$(MISC)$/$(TARGET).exe.manifest: template.manifest
-   $(COPY) $< $@
-.ELSE
-$(MISC)$/$(TARGET).exe.template.manifest: template.manifest
-   $(COPY) $< $@
-
-$(MISC)$/$(TARGET).exe.linker.manifest: $(BIN)$/$(TARGET)$(EXECPOST)
-   mt.exe -inputresource:$(BIN)$/$(TARGET)$(EXECPOST) -out:$@
-
-$(MISC)$/$(TARGET).exe.manifest: $(MISC)$/$(TARGET).exe.template.manifest $(MISC)$/$(TARGET).exe.linker.manifest
-   mt.exe -manifest $(MISC)$/$(TARGET).exe.linker.manifest $(MISC)$/$(TARGET).exe.template.manifest -out:$@
-.ENDIF
-
-# create a manifest file with the same name as the
-# office executable file soffice.bin.manifest
-.IF "$(CCNUMVER)" <= "001399999999"
-$(MISC)$/$(TARGET).bin.manifest: template.manifest
-   $(COPY) $< $@
-.ELSE
-$(MISC)$/$(TARGET).bin.manifest: $(MISC)$/$(TARGET).exe.manifest
-   $(COPY) $(MISC)$/$(TARGET).exe.manifest $@
-.ENDIF
-
-$(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST)
-   $(COPY) $< $@
-
-$(BIN)$/so$/$(TARGET).bin: $(BIN)$/so$/$(TARGET)$(EXECPOST)
-   $(COPY) $< $@
-
-.ENDIF # WNT
-
-$(MISC)$/binso_created.flg :
-    @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@
-
-.ENDIF
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/officeloader.rc
index 53b20852c40d..3d37043c848b 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/officeloader.rc
@@ -70,6 +70,7 @@ VS_VERSION_INFO VERSIONINFO
 		}
 	}
 
+1 ICON PPS(RES_APP_ICON) "\0"
 2 ICON "icons/oasis-text.ico"
 3 ICON "icons/oasis-text-template.ico"
 4 ICON "icons/oasis-spreadsheet.ico"
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
deleted file mode 100755
index caacb294122d..000000000000
--- a/desktop/util/ooverinfo2.rc
+++ /dev/null
@@ -1,76 +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.
- *
- *************************************************************************/
-
-#include "version.hrc"
-
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-//                  language/character set specification table
-// -----------------------------------------------------------------------
-
-
-ICON 2 "icons/oasis-text.ico"
-ICON 3 "icons/oasis-text-template.ico"
-ICON 4 "icons/oasis-spreadsheet.ico"
-ICON 5 "icons/oasis-spreadsheet-template.ico"
-ICON 6 "icons/oasis-drawing.ico"
-ICON 7 "icons/oasis-drawing-template.ico"
-ICON 8 "icons/oasis-presentation.ico"
-ICON 9 "icons/oasis-presentation-template.ico"
-ICON 10 "icons/oasis-presentation-template.ico"
-// ICON 11 "icons/oasis-master-document.ico"
-// ICON 12 "icons/oasis-web-template.ico"
-ICON 13 "icons/oasis-empty-document.ico"
-ICON 14 "icons/oasis-database.ico"
-ICON 15 "icons/oasis-formula.ico"
-ICON 16 "icons/oasis-web-template.ico"
-ICON 17 "icons/empty-document.ico"
-ICON 18 "icons/empty-document.ico"
-ICON 19 "icons/ooo-open.ico"
-ICON 20 "icons/empty-document.ico"
-ICON 21 "icons/ooo-writer-app.ico"
-ICON 22 "icons/ooo-calc-app.ico"
-ICON 23 "icons/ooo-draw-app.ico"
-ICON 24 "icons/ooo-impress-app.ico"
-ICON 25 "icons/ooo-math-app.ico"
-ICON 26 "icons/ooo-base-app.ico"
-ICON 27 "icons/oasis-empty-document.ico"
-ICON 28 "icons/text.ico"
-ICON 29 "icons/text-template.ico"
-ICON 30 "icons/spreadsheet.ico"
-ICON 31 "icons/spreadsheet-template.ico"
-ICON 32 "icons/drawing.ico"
-ICON 33 "icons/drawing-template.ico"
-ICON 34 "icons/presentation.ico"
-ICON 35 "icons/presentation-template.ico"
-ICON 36 "icons/master-document.ico"
-ICON 37 "icons/empty-document.ico"
-ICON 38 "icons/database.ico"
-ICON 39 "icons/formula.ico"
-ICON 40 "icons/oxt-extension.ico"
-
diff --git a/desktop/util/soffice.ico b/desktop/util/soffice.ico
deleted file mode 100644
index 88ccf5e5a6a0..000000000000
--- a/desktop/util/soffice.ico
+++ /dev/null
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
deleted file mode 100644
index 4c01f6b6b237..000000000000
--- a/desktop/util/verinfo.rc
+++ /dev/null
@@ -1,116 +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.
- *
- *************************************************************************/
-
-#define VER_FIRSTYEAR	2007
-
-#include <windows.h>
-#include "version_so.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-#ifndef SUBVERSION
-	FILEVERSION    VERSION, 0, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	FILEFLAGSMASK 0x3F
-	FILEFLAGS
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-	FILEOS VOS_NT_WINDOWS32
-	FILETYPE VFT_APP
-	{
-		BLOCK "StringFileInfo"
-		{
-			BLOCK "040904E4"
-			{
-				// International StringTable
-                VALUE "CompanyName", 		"The Document Foundation\0"
-				VALUE "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "OriginalFilename",	"SOFFICE.EXE\0"
-				VALUE "InternalName", 		"SOFFICE\0"
-				VALUE "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
-			}
-		}
-
-		BLOCK "VarFileInfo"
-		{
-			VALUE "Translation", 0x0409, 1252
-		}
-	}
-
-2 ICON "icons/oasis-text.ico"
-3 ICON "icons/oasis-text-template.ico"
-4 ICON "icons/oasis-spreadsheet.ico"
-5 ICON "icons/oasis-spreadsheet-template.ico"
-6 ICON "icons/oasis-drawing.ico"
-7 ICON "icons/oasis-drawing-template.ico"
-8 ICON "icons/oasis-presentation.ico"
-9 ICON "icons/oasis-presentation-template.ico"
-10 ICON "icons/oasis-presentation-template.ico"
-11 ICON "icons/oasis-master-document.ico"
-12 ICON "icons/oasis-web-template.ico"
-13 ICON "icons/oasis-empty-document.ico"
-14 ICON "icons/oasis-database.ico"
-15 ICON "icons/oasis-formula.ico"
-16 ICON "icons/oasis-web-template.ico"
-17 ICON "icons/empty-document.ico"
-18 ICON "icons/empty-document.ico"
-19 ICON "icons/so9_main_app.ico"
-20 ICON "icons/empty-document.ico"
-21 ICON "icons/so9_writer_app.ico"
-22 ICON "icons/so9_calc_app.ico"
-23 ICON "icons/so9_draw_app.ico"
-24 ICON "icons/so9_impress_app.ico"
-25 ICON "icons/so9_math_app.ico"
-26 ICON "icons/so9_base_app.ico"
-27 ICON "icons/oasis-empty-document.ico"
-28 ICON "icons/text.ico"
-29 ICON "icons/text-template.ico"
-30 ICON "icons/spreadsheet.ico"
-31 ICON "icons/spreadsheet-template.ico"
-32 ICON "icons/drawing.ico"
-33 ICON "icons/drawing-template.ico"
-34 ICON "icons/presentation.ico"
-35 ICON "icons/presentation-template.ico"
-36 ICON "icons/master-document.ico"
-37 ICON "icons/empty-document.ico"
-38 ICON "icons/database.ico"
-39 ICON "icons/formula.ico"
-40 ICON "icons/oxt-extension.ico"
diff --git a/desktop/win32/source/QuickStart/QuickStart.cpp b/desktop/win32/source/QuickStart/QuickStart.cxx
index 3531c29ea317..3531c29ea317 100755
--- a/desktop/win32/source/QuickStart/QuickStart.cpp
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
diff --git a/desktop/win32/source/QuickStart/makefile.mk b/desktop/win32/source/QuickStart/makefile.mk
deleted file mode 100644
index 41242d849dfb..000000000000
--- a/desktop/win32/source/QuickStart/makefile.mk
+++ /dev/null
@@ -1,74 +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=sysui
-TARGET=quickstart
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Resources ----------------------------------------------------
-
-RCFILES=OOQuickStart.rc
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/QuickStart.obj
-
-APP1OBJS=$(OBJFILES)
-APP1NOSAL=TRUE
-APP1TARGET=$(TARGET)
-APP1RPATH=BRAND
-.IF "$(COM)"=="GCC"
-APP1STDLIBS=-luuid
-.ELSE
-APP1STDLIBS=comsupp.lib
-.ENDIF
-
-APP1STDLIBS+=$(SHELL32LIB)\
-            $(OLE32LIB)\
-            $(GDI32LIB)\
-            $(OLEAUT32LIB)\
-            $(COMDLG32LIB)\
-            $(KERNEL32LIB)\
-            $(OLEAUT32LIB)
-
-APP1NOSVRES=$(RES)$/$(TARGET).res
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/QuickStart/so/makefile.mk b/desktop/win32/source/QuickStart/so/makefile.mk
deleted file mode 100755
index 50154c7d50b2..000000000000
--- a/desktop/win32/source/QuickStart/so/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=sysui
-TARGET=soquickstart
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Resources ----------------------------------------------------
-
-.IF "$(LINK_SO)"=="TRUE"
-
-RCFILES=QuickStart.rc
-INCPRE=..
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(OBJ)$/QuickStart.obj
-
-APP1OBJS=$(OBJFILES)
-APP1NOSAL=TRUE
-APP1TARGET=$(TARGET)
-APP1RPATH=BRAND
-.IF "$(COM)"=="GCC"
-APP1STDLIBS=-luuid
-.ELSE
-APP1STDLIBS=comsupp.lib
-.ENDIF
-
-APP1STDLIBS+=$(SHELL32LIB)\
-            $(OLE32LIB)\
-            $(GDI32LIB)\
-            $(OLEAUT32LIB)\
-            $(COMDLG32LIB)\
-            $(KERNEL32LIB)\
-            $(OLEAUT32LIB)
-
-APP1NOSVRES=$(RES)$/$(TARGET).res
-
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/launcher.rc
index c5fcc811d0e2..1ca6fc6984d4 100755
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -69,3 +69,5 @@ VS_VERSION_INFO VERSIONINFO
 			VALUE "Translation", 0x0409, 1252
 		}
 	}
+
+1 ICON PPS(RES_APP_ICON) "\0"
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
deleted file mode 100755
index d08309bbed24..000000000000
--- a/desktop/win32/source/applauncher/makefile.mk
+++ /dev/null
@@ -1,150 +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=desktop
-TARGET=applauncher
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CDEFS+=-DUNICODE
-
-
-OBJFILES= \
-    $(OBJ)$/launcher.obj \
-    $(OBJ)$/swriter.obj \
-    $(OBJ)$/scalc.obj \
-    $(OBJ)$/sdraw.obj \
-    $(OBJ)$/simpress.obj \
-    $(OBJ)$/sbase.obj \
-    $(OBJ)$/smath.obj \
-    $(OBJ)$/sweb.obj
-
-# SO launcher
-.IF "$(LINK_SO)"=="TRUE"
-.IF "$(BUILD_SPECIAL)"!=""
-APP1DEPN= $(APP1RES) verinfo.rc
-APP1TARGET=so$/swriter
-APP1NOSAL=TRUE
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
-APP1OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/swriter.obj
-APP1STDLIBS = $(SHELL32LIB)
-APP1VERINFO=verinfo.rc
-APP1PRODUCTDEF+=-DRES_APP_NAME=swriter
-
-APP2TARGET=so$/scalc
-APP2NOSAL=TRUE
-APP2LINKRES=$(MISC)$/$(TARGET)2.res
-APP2ICON=$(SOLARRESDIR)$/icons/so9_calc_app.ico
-APP2OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/scalc.obj
-APP2STDLIBS = $(SHELL32LIB)
-APP2DEPN=verinfo.rc
-APP2VERINFO=verinfo.rc
-APP2PRODUCTDEF+=-DRES_APP_NAME=scalc
-
-APP3TARGET=so$/sdraw
-APP3NOSAL=TRUE
-APP3LINKRES=$(MISC)$/$(TARGET)3.res
-APP3ICON=$(SOLARRESDIR)$/icons/so9_draw_app.ico
-APP3OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sdraw.obj
-APP3STDLIBS = $(SHELL32LIB)
-APP3DEPN=verinfo.rc
-APP3VERINFO=verinfo.rc
-APP3PRODUCTDEF+=-DRES_APP_NAME=sdraw
-
-APP4TARGET=so$/simpress
-APP4NOSAL=TRUE
-APP4LINKRES=$(MISC)$/$(TARGET)4.res
-APP4ICON=$(SOLARRESDIR)$/icons/so9_impress_app.ico
-APP4OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/simpress.obj
-APP4STDLIBS = $(SHELL32LIB)
-APP4DEPN=verinfo.rc
-APP4VERINFO=verinfo.rc
-APP4PRODUCTDEF+=-DRES_APP_NAME=simpress
-
-APP5TARGET=so$/sbase
-APP5NOSAL=TRUE
-APP5LINKRES=$(MISC)$/$(TARGET)5.res
-APP5ICON=$(SOLARRESDIR)$/icons/so9_base_app.ico
-APP5OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sbase.obj
-APP5STDLIBS = $(SHELL32LIB)
-APP5DEPN=verinfo.rc
-APP5VERINFO=verinfo.rc
-APP5PRODUCTDEF+=-DRES_APP_NAME=sbase
-
-APP6TARGET=so$/smath
-APP6NOSAL=TRUE
-APP6LINKRES=$(MISC)$/$(TARGET)6.res
-APP6ICON=$(SOLARRESDIR)$/icons/so9_math_app.ico
-APP6OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/smath.obj
-APP6STDLIBS = $(SHELL32LIB)
-APP6DEPN=verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6PRODUCTDEF+=-DRES_APP_NAME=smath
-
-APP7TARGET=so$/sweb
-APP7NOSAL=TRUE
-APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
-APP7OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sweb.obj
-APP7STDLIBS = $(SHELL32LIB)
-APP7DEPN=verinfo.rc
-APP7VERINFO=verinfo.rc
-APP7PRODUCTDEF+=-DRES_APP_NAME=sweb
-
-
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
deleted file mode 100755
index 02f240cce9e0..000000000000
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ /dev/null
@@ -1,130 +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=desktop
-TARGET=applauncher
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=swriter
-APP1DEPN=verinfo.rc
-APP1VERINFO=verinfo.rc
-APP1NOSAL=TRUE
-APP1LINKRES=$(MISC)$/$(TARGET)1.res
-APP1ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico
-APP1OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/swriter.obj
-APP1STDLIBS = $(SHELL32LIB)
-APP1PRODUCTDEF+=-DRES_APP_NAME=$(APP1TARGET)
-
-APP2TARGET=scalc
-APP2DEPN=verinfo.rc
-APP2VERINFO=verinfo.rc
-APP2NOSAL=TRUE
-APP2LINKRES=$(MISC)$/$(TARGET)2.res
-APP2ICON=$(SOLARRESDIR)$/icons/ooo3_calc_app.ico
-APP2OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/scalc.obj
-APP2STDLIBS = $(SHELL32LIB)
-APP2PRODUCTDEF+=-DRES_APP_NAME=$(APP2TARGET)
-
-APP3TARGET=sdraw
-APP3DEPN=verinfo.rc
-APP3VERINFO=verinfo.rc
-APP3NOSAL=TRUE
-APP3LINKRES=$(MISC)$/$(TARGET)3.res
-APP3ICON=$(SOLARRESDIR)$/icons/ooo3_draw_app.ico
-APP3OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/sdraw.obj
-APP3STDLIBS = $(SHELL32LIB)
-APP3PRODUCTDEF+=-DRES_APP_NAME=$(APP3TARGET)
-
-APP4TARGET=simpress
-APP4DEPN=verinfo.rc
-APP4VERINFO=verinfo.rc
-APP4NOSAL=TRUE
-APP4LINKRES=$(MISC)$/$(TARGET)4.res
-APP4ICON=$(SOLARRESDIR)$/icons/ooo3_impress_app.ico
-APP4OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/simpress.obj
-APP4STDLIBS = $(SHELL32LIB)
-APP4PRODUCTDEF+=-DRES_APP_NAME=$(APP4TARGET)
-
-APP5TARGET=smath
-APP5DEPN=verinfo.rc
-APP5VERINFO=verinfo.rc
-APP5NOSAL=TRUE
-APP5LINKRES=$(MISC)$/$(TARGET)5.res
-APP5ICON=$(SOLARRESDIR)$/icons/ooo3_math_app.ico
-APP5OBJS = \
-        $(OBJ)$/launcher.obj\
-        $(OBJ)$/smath.obj
-APP5STDLIBS = $(SHELL32LIB)
-APP5PRODUCTDEF+=-DRES_APP_NAME=$(APP5TARGET)
-
-APP6TARGET=sbase
-APP6DEPN=verinfo.rc
-APP6VERINFO=verinfo.rc
-APP6NOSAL=TRUE
-APP6LINKRES=$(MISC)$/$(TARGET)6.res
-APP6ICON=$(SOLARRESDIR)$/icons/ooo3_base_app.ico
-APP6OBJS = \
-        $(OBJ)$/launcher.obj\
-       $(OBJ)$/sbase.obj
-APP6STDLIBS = $(SHELL32LIB)
-APP6PRODUCTDEF+=-DRES_APP_NAME=$(APP6TARGET)
-
-APP7TARGET=sweb
-APP7DEPN=verinfo.rc
-APP7VERINFO=verinfo.rc
-APP7NOSAL=TRUE
-APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico
-APP7OBJS = \
-        $(OBJ)$/launcher.obj\
-       $(OBJ)$/sweb.obj
-APP7STDLIBS = $(SHELL32LIB)
-APP7PRODUCTDEF+=-DRES_APP_NAME=$(APP7TARGET)
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
deleted file mode 100755
index afb58f3a377c..000000000000
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ /dev/null
@@ -1,76 +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.
- *
- *************************************************************************/
-
-#define VER_FIRSTYEAR	2009
-
-#include <windows.h>
-#include "version_so.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO versioninfo
-#ifndef SUBVERSION
-	fileversion    VERSION, 0, VERVARIANT, VER_COUNT
-	productversion VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	fileflagsmask 0x3F
-	fileflags
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-	fileos VOS_NT_WINDOWS32
-	filetype VFT_APP
-	{
-		block "StringFileInfo"
-		{
-			block "040904E4"
-			{
-				// International StringTable
-				value "CompanyName", 		"The Document Foundation\0"
-				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
-				value "FileVersion",		PPS(VER_LEVEL) "\0"
-				value "ProductVersion",		PPS(VER_LEVEL) "\0"
-				value "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
-				value "InternalName",		PPS(RES_APP_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
-			}
-		}
-
-		block "VarFileInfo"
-		{
-			value "Translation", 0x0409, 1252
-		}
-	}
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
deleted file mode 100755
index 7912471fba13..000000000000
--- a/desktop/win32/source/guiloader/makefile.mk
+++ /dev/null
@@ -1,66 +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=desktop
-TARGET=guiloader
-LIBTARGET=NO
-TARGETTYPE=GUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=guiloader
-APP1NOSAL=TRUE
-APP1ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
-APP1OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB1=$(SHLWAPILIB)
-
-.IF "$(LINK_SO)"=="TRUE"
-APP2TARGET=so$/guiloader
-APP2NOSAL=TRUE
-APP2ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
-APP2OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIB2=$(SHLWAPILIB)
-.ENDIF # "$(LINK_SO)"=="TRUE"
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
deleted file mode 100755
index 660a48bcdca9..000000000000
--- a/desktop/win32/source/guistdio/makefile.mk
+++ /dev/null
@@ -1,58 +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=desktop
-TARGET=guistdio
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-TARGETTYPE=CUI
-UWINAPILIB=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=$(APP1OBJS) $(APP2OBJS)
-
-APP1NOSAL=TRUE
-APP1OBJS=$(OBJ)$/guistdio.obj
-APP1TARGET=$(TARGET)
-
-APP2NOSAL=TRUE
-APP2OBJS=$(OBJ)$/unopkgio.obj
-APP2TARGET=unopkgio
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
deleted file mode 100755
index b74ffc8f3213..000000000000
--- a/desktop/win32/source/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=desktop
-TARGET=sowrap
-LIBTARGET=NO
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-UWINAPILIB =
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-        $(OBJ)$/wrapperw.obj \
-        $(OBJ)$/lwrapw.obj \
-        $(OBJ)$/rwrapw.obj \
-        $(OBJ)$/sowrapper.obj \
-        $(OBJ)$/extendloaderenvironment.obj \
-        $(OBJ)$/unoinfo.obj
-
-APP1TARGET = unoinfo
-APP1OBJS = $(OBJ)$/unoinfo.obj $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS =
-APP1RPATH = BRAND
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
deleted file mode 100755
index 5609dea25085..000000000000
--- a/desktop/win32/source/officeloader/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=desktop
-TARGET=officeloader
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES = \
-        $(OBJ)$/officeloader.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/desktop/win32/source/setup/Makefile b/desktop/win32/source/setup/Makefile
new file mode 100644
index 000000000000..c5337ee8f272
--- /dev/null
+++ b/desktop/win32/source/setup/Makefile
@@ -0,0 +1,43 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <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.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup
+ifneq ($(WITH_LANG),)
+# TODO: how the localized version is made?
+ULF := setup.ulf
+else
+ULF := setup.ulf
+endif
+
+$(DESTDIR)/loader2.rc : $(ULF) rcfooter.txt rcheader.txt rctmpl.txt
+	lngconvex.exe -ulf $(ULF) -rc $@ -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+
+.DEFAULT_TARGET := all
+.PHONY : all
+all : $(DESTDIR)/loader2.rc
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
deleted file mode 100644
index f0c6e0e955fd..000000000000
--- a/desktop/win32/source/setup/makefile.mk
+++ /dev/null
@@ -1,90 +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		=	desktop
-TARGET		=	loader2
-LIBTARGET	=	NO
-DYNAMIC_CRT	=
-TARGETTYPE	=	GUI
-
-ENABLE_EXCEPTIONS	=	TRUE
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein -----------------------------------------------------------
-
-INCPRE+=$(MFC_INCLUDE)
-
-.IF "$(USE_DEBUG_RUNTIME)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
-
-RCFILES=	$(RES)$/$(TARGET).rc
-
-ULFFILES=	setup.ulf
-
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/$(TARGET)
-.ELSE			# "$(WITH_LANG)"!=""
-ULFDIR:=.
-.ENDIF			# "$(WITH_LANG)"!=""
-
-OBJFILES= 	$(OBJ)$/setup_main.obj \
-            $(OBJ)$/setup_w.obj
-
-# --- Targets ------------------------------------------------------
-# Generate the native Windows resource file
-# using lngconvex.exe 
-
-UWINAPILIB=		$(0)
-LIBSALCPPRT=	$(0)
-
-APP1NOSAL=		TRUE
-APP1TARGET=		loader2
-
-APP1STDLIBS=	$(GDI32LIB) $(ADVAPI32LIB) $(SHELL32LIB) $(MSILIB)
-.IF "$(COM)"!="GCC"
-APP1STDLIBS+=	libcmt.lib
-.ENDIF
-APP1OBJS=		$(OBJFILES)
-
-APP1DEF=		$(MISC)$/$(TARGET).def
-
-APP1RES=		$(RES)$/$(TARGET).res
-APP1NOSVRES=	$(RES)$/$(TARGET).res
-
-# --- setup --------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(LNGCONVEX) -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
-
diff --git a/desktop/zipintro/delzip b/desktop/zipintro/delzip
deleted file mode 100755
index 8b137891791f..000000000000
--- a/desktop/zipintro/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
deleted file mode 100755
index c0f14068823f..000000000000
--- a/desktop/zipintro/makefile.mk
+++ /dev/null
@@ -1,92 +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=desktop
-TARGET=zipintro
-
-.INCLUDE :  settings.mk
-
-ZIP1LIST= \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/about.png
-ZIP2LIST= \
-    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png
-ZIP3LIST= \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_space.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png
-
-ZIP1TARGET=brand
-ZIP1DEPS=$(ZIP1LIST)
-ZIP2TARGET=brand_dev
-ZIP2DEPS=$(ZIP2LIST)
-ZIP3TARGET=shell
-ZIP3DEPS=$(ZIP3LIST)
-
-.INCLUDE :  target.mk
-
-ALLTAR : \
-    $(COMMONBIN)$/intro.zip \
-    $(COMMONBIN)$/brand_dev$/intro.zip \
-    $(COMMONBIN)$/shell/shell.zip
-
-$(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip
-    @@-$(MKDIR) $(@:d)
-    @$(COPY) $< $@
-
-$(COMMONBIN)$/intro.zip : $(COMMONBIN)$/brand.zip
-    @@-$(MKDIR) $(@:d)
-    @$(COPY) $< $@
-
-$(COMMONBIN)$/shell$/shell.zip : $(COMMONBIN)$/shell.zip
-    @@-$(MKDIR) $(@:d)
-    @$(COPY) $< $@
-
-$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(MISC)$/%.png : $(SOLARSRC)$/%.png
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-.IF "$(INTRO_BITMAP)" != ""
-$(MISC)$/$(RSCDEFIMG)$/brand$/intro.png : $(INTRO_BITMAP)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ENDIF
-
-.IF "$(ABOUT_BITMAP)" != ""
-$(MISC)$/$(RSCDEFIMG)$/brand$/about.png : $(ABOUT_BITMAP)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ENDIF