[Libreoffice-commits] .: 5 commits - configure.in desktop/AllLangResTarget_deploymentgui.mk desktop/AllLangResTarget_deployment.mk desktop/AllLangResTarget_dkt.mk desktop/branding desktop/Executable_guiloader.mk desktop/Executable_guistdio.mk desktop/Executable_loader2.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unoinfo.mk desktop/Executable_unopkg.bin.mk desktop/Executable_unopkgio.mk desktop/Executable_unopkg.mk desktop/inc desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library _spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk desktop/Makefile desktop/Module_desktop.mk desktop/Package_branding.mk desktop/Package_intro.mk desktop/Package_manifest.mk desktop/Package_rcfile.mk desktop/Package_scripts.mk desktop/Pagein_calc.mk desktop/Pagein_common.mk desktop/Pagein_draw.mk desktop/Pagein_impress.mk desktop/Pagein.mk desktop/Pagein_writer.mk desktop/prj desktop/scripts desktop/source desktop/unx desktop/util desktop/win32 desktop/WinResTarget_officeloader.mk desktop/WinResTarget_quickstart.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTarget_simpress.mk desktop/WinResTarget_smath.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk desktop/Zip_brand_dev.mk desktop/Zip_brand.mk desktop/zipintro desktop/Zip_shell.mk .gitignore Module_tail_build.mk postprocess/packcomponents postprocess/prj RepositoryExternal.mk RepositoryFixes.mk Reposito ry.mk RepositoryModule_ooo.mk scp2/source tail_build/prj

David Tardon dtardon at kemper.freedesktop.org
Thu Sep 15 05:50:02 PDT 2011


 .gitignore                                                   |    1 
 Module_tail_build.mk                                         |    2 
 Repository.mk                                                |   73 +
 RepositoryExternal.mk                                        |   62 +
 RepositoryFixes.mk                                           |    6 
 RepositoryModule_ooo.mk                                      |    1 
 configure.in                                                 |    6 
 desktop/AllLangResTarget_deployment.mk                       |   56 +
 desktop/AllLangResTarget_deploymentgui.mk                    |   53 +
 desktop/AllLangResTarget_dkt.mk                              |   44 +
 desktop/Executable_guiloader.mk                              |   46 +
 desktop/Executable_guistdio.mk                               |   45 +
 desktop/Executable_loader2.mk                                |   59 +
 desktop/Executable_officeloader.mk                           |   71 +
 desktop/Executable_oosplash.mk                               |   82 ++
 desktop/Executable_quickstart.mk                             |   62 +
 desktop/Executable_sbase.mk                                  |   46 +
 desktop/Executable_scalc.mk                                  |   46 +
 desktop/Executable_sdraw.mk                                  |   46 +
 desktop/Executable_simpress.mk                               |   46 +
 desktop/Executable_smath.mk                                  |   46 +
 desktop/Executable_soffice.bin.mk                            |   56 +
 desktop/Executable_soffice.mk                                |   65 +
 desktop/Executable_sweb.mk                                   |   46 +
 desktop/Executable_swriter.mk                                |   46 +
 desktop/Executable_unoinfo.mk                                |   43 +
 desktop/Executable_unopkg.bin.mk                             |   49 +
 desktop/Executable_unopkg.mk                                 |   49 +
 desktop/Executable_unopkgio.mk                               |   45 +
 desktop/Library_deployment.mk                                |   95 ++
 desktop/Library_deploymentgui.mk                             |   79 ++
 desktop/Library_deploymentmisc.mk                            |   75 +
 desktop/Library_migrationoo2.mk                              |   64 +
 desktop/Library_migrationoo3.mk                              |   59 +
 desktop/Library_offacc.mk                                    |   52 +
 desktop/Library_sofficeapp.mk                                |   97 ++
 desktop/Library_spl.mk                                       |   60 +
 desktop/Library_spl_unx.mk                                   |   47 +
 desktop/Library_unopkgapp.mk                                 |   66 +
 desktop/Makefile                                             |   39 +
 desktop/Module_desktop.mk                                    |  121 +++
 desktop/Package_branding.mk                                  |   30 
 desktop/Package_intro.mk                                     |   33 
 desktop/Package_manifest.mk                                  |   36 
 desktop/Package_rcfile.mk                                    |   30 
 desktop/Package_scripts.mk                                   |   42 +
 desktop/Pagein.mk                                            |  102 ++
 desktop/Pagein_calc.mk                                       |   35 
 desktop/Pagein_common.mk                                     |  112 ++
 desktop/Pagein_draw.mk                                       |   35 
 desktop/Pagein_impress.mk                                    |   35 
 desktop/Pagein_writer.mk                                     |   35 
 desktop/WinResTarget_officeloader.mk                         |   46 +
 desktop/WinResTarget_quickstart.mk                           |   40 +
 desktop/WinResTarget_sbase.mk                                |   46 +
 desktop/WinResTarget_scalc.mk                                |   46 +
 desktop/WinResTarget_sdraw.mk                                |   46 +
 desktop/WinResTarget_simpress.mk                             |   46 +
 desktop/WinResTarget_smath.mk                                |   46 +
 desktop/WinResTarget_soffice.mk                              |   46 +
 desktop/WinResTarget_sweb.mk                                 |   46 +
 desktop/WinResTarget_swriter.mk                              |   46 +
 desktop/Zip_brand.mk                                         |   37 
 desktop/Zip_brand_dev.mk                                     |   33 
 desktop/Zip_shell.mk                                         |   36 
 desktop/branding/Makefile                                    |   48 +
 desktop/inc/makefile.mk                                      |   47 -
 desktop/prj/build.lst                                        |   43 -
 desktop/prj/d.lst                                            |  146 ---
 desktop/prj/makefile.mk                                      |   40 +
 desktop/scripts/makefile.mk                                  |   68 -
 desktop/scripts/soffice.sh                                   |  178 ----
 desktop/scripts/soffice.sh.in                                |  177 ++++
 desktop/source/app/main.c                                    |    2 
 desktop/source/app/makefile.mk                               |  113 --
 desktop/source/app/sofficemain.cxx                           |    4 
 desktop/source/app/sofficemain.h                             |    4 
 desktop/source/deployment/gui/makefile.mk                    |  109 --
 desktop/source/deployment/makefile.mk                        |  109 --
 desktop/source/deployment/manager/makefile.mk                |   53 -
 desktop/source/deployment/misc/makefile.mk                   |   78 --
 desktop/source/deployment/registry/component/makefile.mk     |   48 -
 desktop/source/deployment/registry/configuration/makefile.mk |   50 -
 desktop/source/deployment/registry/executable/makefile.mk    |   44 -
 desktop/source/deployment/registry/help/makefile.mk          |   50 -
 desktop/source/deployment/registry/makefile.mk               |   49 -
 desktop/source/deployment/registry/package/makefile.mk       |   48 -
 desktop/source/deployment/registry/script/makefile.mk        |   49 -
 desktop/source/deployment/registry/sfwk/makefile.mk          |   48 -
 desktop/source/deployment/target.pmk                         |   36 
 desktop/source/deployment/unopkg/makefile.mk                 |   44 -
 desktop/source/inc/desktopdllapi.h                           |   41 +
 desktop/source/migration/makefile.mk                         |   52 -
 desktop/source/migration/services/makefile.mk                |  131 ---
 desktop/source/offacc/makefile.mk                            |   70 -
 desktop/source/pagein/makefile.mk                            |  169 ----
 desktop/source/pkgchk/unopkg/makefile.mk                     |   98 --
 desktop/source/pkgchk/unopkg/unopkg_app.cxx                  |    3 
 desktop/source/pkgchk/unopkg/unopkg_main.c                   |    2 
 desktop/source/pkgchk/unopkg/unopkg_main.h                   |    4 
 desktop/source/splash/makefile.mk                            |   80 --
 desktop/unx/source/makefile.mk                               |   78 --
 desktop/unx/source/officeloader/makefile.mk                  |   47 -
 desktop/unx/splash/makefile.mk                               |   76 -
 desktop/util/Makefile                                        |   40 +
 desktop/util/makefile.mk                                     |  233 ------
 desktop/util/officeloader.rc                                 |  113 ++
 desktop/util/ooverinfo.rc                                    |  112 --
 desktop/util/ooverinfo2.rc                                   |   76 -
 desktop/util/verinfo.rc                                      |  116 --
 desktop/win32/source/QuickStart/QuickStart.cpp               |  426 -----------
 desktop/win32/source/QuickStart/QuickStart.cxx               |  426 +++++++++++
 desktop/win32/source/QuickStart/makefile.mk                  |   74 -
 desktop/win32/source/QuickStart/so/makefile.mk               |   77 -
 desktop/win32/source/applauncher/launcher.rc                 |   73 +
 desktop/win32/source/applauncher/makefile.mk                 |  150 ---
 desktop/win32/source/applauncher/ooo/makefile.mk             |  130 ---
 desktop/win32/source/applauncher/ooo/verinfo.rc              |   71 -
 desktop/win32/source/applauncher/verinfo.rc                  |   76 -
 desktop/win32/source/guiloader/makefile.mk                   |   66 -
 desktop/win32/source/guistdio/makefile.mk                    |   58 -
 desktop/win32/source/makefile.mk                             |   60 -
 desktop/win32/source/officeloader/makefile.mk                |   45 -
 desktop/win32/source/setup/Makefile                          |   43 +
 desktop/win32/source/setup/makefile.mk                       |   90 --
 desktop/zipintro/delzip                                      |    1 
 desktop/zipintro/makefile.mk                                 |   92 --
 dev/null                                                     |binary
 postprocess/packcomponents/makefile.mk                       |   14 
 postprocess/prj/build.lst                                    |    2 
 scp2/source/ooo/common_brand.scp                             |    2 
 scp2/source/ooo/file_library_ooo.scp                         |   18 
 tail_build/prj/build.lst                                     |    2 
 133 files changed, 4257 insertions(+), 4202 deletions(-)

New commits:
commit 1ee990864886fb355afbb75e31f8c799aaf9c9a6
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 15 14:44:38 2011 +0200

    move automation to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 013feca..d43bd09 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,tail_end))
 
 $(eval $(call gb_Module_add_moduledirs,tail_end,\
     animations \
+    automation \
     basctl \
     chart2 \
     cui \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index daaf86e..9e056a8 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8eae3ec..9628036 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx sysui test toolkit tools ucbhelper unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript solenv NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx sysui test toolkit tools ucbhelper unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript solenv NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit fca439ea5d25244f718cf8cd91ea8694990be172
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 15 14:44:36 2011 +0200

    move desktop to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 715d2e7..013feca 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     chart2 \
     cui \
     dbaccess \
+    desktop \
     fileaccess \
     forms \
     formula \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ec685ce..daaf86e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po      postprocess     ::      accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 93f3ce1..8eae3ec 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl xmloff xmlscript solenv NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx sysui test toolkit tools ucbhelper unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript solenv NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 6df9c479f58ea94141a3a43eb7fd6fb4d1fd5c8b
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 15 14:44:34 2011 +0200

    gbuildize desktop

diff --git a/Repository.mk b/Repository.mk
index a0ac0f0..06e1f27 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -43,14 +43,51 @@ $(eval $(call gb_Helper_register_executables,OOO, \
     testtool \
 ))
 
-ifneq ($(OS),WNT)
+ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,BRAND,\
+	guiloader \
+	guistdio \
+	loader2 \
+	officeloader \
+	quickstart \
+	sbase \
+	scalc \
+	sdraw \
+	simpress \
+	soffice \
+	smath \
+	sweb \
+	swriter \
+	unoinfo \
+	unopkg \
+	unopkgio \
+))
+
+else
+
+$(eval $(call gb_Helper_register_executables,BRAND,\
+	soffice.bin \
 	spadmin.bin \
+	unopkg.bin \
+))
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Helper_register_executables,BRAND,\
+	officeloader \
+))
+
+else
+
+$(eval $(call gb_Helper_register_executables,BRAND,\
+	oosplash \
 ))
 
 endif
 
+endif
+
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	PptImporter \
 	adabas \
@@ -84,6 +121,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     dbmm \
     dbtools \
     dbu \
+    deploymentmisc \
     desktop_detector \
     doctok \
     drawinglayer \
@@ -108,6 +146,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     fwk \
     fwl \
     fwm \
+    helplinker \
     hwp \
     i18npaper \
     i18nregexp \
@@ -130,6 +169,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     msword \
 	msworks \
 	odfflatxml \
+    offacc \
 	pdffilter \
 	placeware \
     qstart_gtk \
@@ -156,8 +196,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	solver \
     sot \
     spa \
-	svgfilter \
+    spl \
     sts \
+	svgfilter \
     svl \
     svt \
     svx \
@@ -194,6 +235,14 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	xsltfilter \
 ))
 
+ifeq ($(filter MACOSX WNT,$(OS)),)
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    spl_unx \
+))
+
+endif
+
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	xmlreader \
 ))
@@ -202,9 +251,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	avmediagst \
 	avmediawin \
 	collator_data \
+	deployment \
+	deploymentgui \
 	dict_ja \
 	dict_zh \
 	fileacc \
+	filterconfig \
 	index_data \
 	localedata_en \
 	localedata_es \
@@ -214,9 +266,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	neon \
 	package2 \
     reg \
+    sofficeapp \
     store \
 	test \
 	textconv_dict \
+    ucb \
+    ucpfile \
+    unopkgapp \
 	xmlsecurity \
 	xsec_fw \
 	xsec_xmlsec \
@@ -253,8 +309,10 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	bootstrap \
 	cairocanvas \
 	canvasfactory \
+	configmgr \
 	directx5canvas \
 	directx9canvas \
 	expwrap \
@@ -265,13 +323,17 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	i18npool \
 	i18nsearch \
     lomenubar \
+    migrationoo2 \
+    migrationoo3 \
     msforms \
 	mtfrenderer \
 	nullcanvas \
     OGLTrans \
     passwordcontainer \
+    reflection \
 	simplecanvas \
     slideshow \
+    stocservices \
     vbaobj \
     vbaswobj \
 	vclcanvas \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 21c48e4..ea46281 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -656,6 +656,68 @@ $(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
 
 endef
 
+ifeq ($(SYSTEM_DB),YES)
+
+define gb_LinkTarget__use_berkeleydb
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(filter -I%,$(SYSTEM_DB_CFLAGS)) \
+)
+
+$(call gb_LinkTarget_add_defs,$(1),\
+	$(filter -D%,$(SYSTEM_DB_CFLAGS)) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	-l$(DB_LIB) \
+)
+
+endef
+
+else # !SYSTEM_DB
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+	berkeleydb \
+))
+
+define gb_LinkTarget__use_berkeleydb
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	berkeleydb \
+)
+
+endef
+
+endif # SYSTEM_DB
+
+ifeq ($(SYSTEM_LIBPNG),YES)
+
+define gb_LinkTarget__use_png
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(LIBPNG_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(LIBPNG_LIBS) \
+)
+
+endef
+
+else # !SYSTEM_LIBPNG
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+	png \
+))
+
+define gb_LinkTarget__use_png
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	png \
+)
+
+endef
+
+endif # !SYSTEM_LIBPNG
+
 # MacOSX-only frameworks
 # (in alphabetical order)
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 8c907d8..2b9b116 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -34,9 +34,12 @@
 ifneq (,$(filter SOLARIS GCC,$(OS) $(COM)))
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_FILENAMES))
 
 # TODO: this is a hack; we should really build salmain as a regular static library
 gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES))
@@ -44,8 +47,11 @@ endif
 
 ifeq ($(OS),WNT)
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst filterconfig:libfilterconfig%,filterconfig:libfilterconfig1%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 2452c50..428d771 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     cppcanvas \
     cui \
     dbaccess \
+    desktop \
     drawinglayer \
     dtrans \
     editeng \
diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk
new file mode 100644
index 0000000..1ccd45e
--- /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 at 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 0000000..997ee42
--- /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 at 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 0000000..3e3cb18
--- /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 at 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 0000000..478cb1d
--- /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 at 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 0000000..e38efa2
--- /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 at 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 0000000..6e34dc6
--- /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 at 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 0000000..e6b0a0d
--- /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 at 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 0000000..3cf7bae
--- /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 at 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 0000000..aa5e608
--- /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 at 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 0000000..5cd916b
--- /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 at 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 0000000..e93aea2
--- /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 at 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 0000000..dc13c41
--- /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 at 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 0000000..728d8e3
--- /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 at 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 0000000..b7c9307
--- /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 at 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 0000000..3f6e78e
--- /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 at 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 0000000..050f1e0
--- /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 at 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 0000000..14e9296
--- /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 at 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 0000000..30e98b1
--- /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 at 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 0000000..50da655
--- /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 at 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 0000000..e472b1d
--- /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 at 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 0000000..3dffb08
--- /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 at 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 0000000..4563c8e
--- /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 at 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 0000000..dd1c3f3
--- /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 at 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 0000000..15de597
--- /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 at 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 0000000..83172b9
--- /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 at 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 0000000..aac204c
--- /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 at 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 0000000..006c7a9
--- /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 at 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 0000000..6d54c61
--- /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 at 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 0000000..f9e9839
--- /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 at 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 0000000..f65d7a8
--- /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 at 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 0000000..89464da
--- /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 at 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 0000000..5aa3e71
--- /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 at 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/Makefile b/desktop/Makefile
new file mode 100644
index 0000000..8d71119
--- /dev/null
+++ b/desktop/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.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 0000000..ad63561
--- /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 at 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 0000000..c1956cd
--- /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 at 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 0000000..b54c90b
--- /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 at 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 0000000..c694b62
--- /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 at 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 0000000..49abab0
--- /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 at 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 0000000..9292940
--- /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 at 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 0000000..616b9cc
--- /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 at 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)))

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list