[Libreoffice-commits] core.git: cross_toolset/prj Module_cross_tail_build.mk Module_tail_build.mk postprocess/prj RepositoryModule_ooo.mk solenv/gbuild sysui/CustomTarget_deb.mk sysui/CustomTarget_infoplist.mk sysui/CustomTarget_rpm.mk sysui/CustomTarget_share.mk sysui/CustomTarget_slackware.mk sysui/CustomTarget_solaris.mk sysui/desktop sysui/Makefile sysui/Module_sysui.mk sysui/Package_desktop.mk sysui/Package_icons.mk sysui/Package_infoplist.mk sysui/Package_share.mk sysui/prj sysui/util sysui/Zip_osxicons.mk

Peter Foley pefoley2 at verizon.net
Sun Feb 17 13:58:47 PST 2013


 Module_cross_tail_build.mk             |    1 
 Module_tail_build.mk                   |    1 
 RepositoryModule_ooo.mk                |    1 
 cross_toolset/prj/build.lst            |    2 
 postprocess/prj/build.lst              |    2 
 solenv/gbuild/TargetLocations.mk       |    1 
 sysui/CustomTarget_deb.mk              |   69 ++++++++
 sysui/CustomTarget_infoplist.mk        |   40 +++++
 sysui/CustomTarget_rpm.mk              |   51 ++++++
 sysui/CustomTarget_share.mk            |  227 ++++++++++++++++++++++++++++
 sysui/CustomTarget_slackware.mk        |   59 +++++++
 sysui/CustomTarget_solaris.mk          |   53 ++++++
 sysui/Makefile                         |    7 
 sysui/Module_sysui.mk                  |   36 ++++
 sysui/Package_desktop.mk               |   33 ++++
 sysui/Package_icons.mk                 |   53 ++++++
 sysui/Package_infoplist.mk             |   21 ++
 sysui/Package_share.mk                 |   16 ++
 sysui/Zip_osxicons.mk                  |   20 ++
 sysui/desktop/cleanversion/makefile.mk |   41 -----
 sysui/desktop/debian/makefile.mk       |   87 ----------
 sysui/desktop/freedesktop/makefile.mk  |   50 ------
 sysui/desktop/icons/makefile.mk        |   71 --------
 sysui/desktop/macosx/makefile.mk       |   77 ---------
 sysui/desktop/mandriva/makefile.mk     |   50 ------
 sysui/desktop/productversion.mk        |   76 ---------
 sysui/desktop/share/create_tree.sh     |    3 
 sysui/desktop/share/makefile.mk        |  262 ---------------------------------
 sysui/desktop/share/translate.pl       |    4 
 sysui/desktop/slackware/makefile.mk    |  103 ------------
 sysui/desktop/solaris/makefile.mk      |  110 -------------
 sysui/desktop/suse/makefile.mk         |   50 ------
 sysui/desktop/tg_rpm.mk                |   38 ----
 sysui/desktop/util/makefile.mk         |   57 -------
 sysui/prj/build.lst                    |   15 -
 sysui/prj/d.lst                        |   23 --
 sysui/util/checksize.pl                |   78 ---------
 sysui/util/makefile.mk                 |   35 ----
 38 files changed, 695 insertions(+), 1228 deletions(-)

New commits:
commit 01344a8ca57636ac87108c22f777a02fe6d963d5
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Feb 10 18:22:07 2013 -0500

    convert sysui to gbuild and add to tail_build
    
    Change-Id: Ia32e51f0d95e001bcf07766f6340398e0ab1bf6a
    Reviewed-on: https://gerrit.libreoffice.org/2192
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 94aae35..f2f1e58 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	sal \
 	salhelper \
 	sax \
+	setup_native \
 	shell \
 	stoc \
 	store \
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 0495dac..12e0d7e 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -178,6 +178,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	svx \
 	sw \
 	swext \
+	sysui \
 	test \
 	testtools \
 	$(call gb_Helper_optional,TOMCAT,tomcat) \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index cf85f6e..48c0161 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -191,6 +191,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	svx \
 	sw \
 	swext \
+	sysui \
 	test \
 	testtools \
 	$(call gb_Helper_optional,TOMCAT,tomcat) \
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
index e720231..94988a3 100644
--- a/cross_toolset/prj/build.lst
+++ b/cross_toolset/prj/build.lst
@@ -1 +1 @@
-crs	cross_toolset	::	setup_native cross_tail_build NULL
+crs	cross_toolset	::	cross_tail_build NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 1f45920..2445a52 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,2 +1,2 @@
-po      postprocess     ::      HELP:helpcontent2 ODK:odk sysui tail_build NULL
+po      postprocess     ::      HELP:helpcontent2 ODK:odk tail_build NULL
 po	postprocess\prj		nmake	-	all	po_prj NULL
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 0dbb6c1..274598a 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -45,6 +45,7 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/par \
 	$(OUTDIR)/pck \
 	$(OUTDIR)/rdb \
+	$(OUTDIR)/res \
 	$(OUTDIR)/share \
 	$(OUTDIR)/unittest \
 	$(OUTDIR)/xml \
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
new file mode 100644
index 0000000..80f29e3
--- /dev/null
+++ b/sysui/CustomTarget_deb.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+deb_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/deb)
+deb_SRCDIR := $(SRCDIR)/sysui/desktop/debian
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/deb))
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/deb,\
+$(foreach product,$(PRODUCTLIST),\
+	$(product)-desktop-integration.tar.gz \
+	$(product)/DEBIAN/control \
+	$(product)/DEBIAN/postinst \
+	$(product)/DEBIAN/postrm \
+	$(product)/DEBIAN/prerm \
+	$(product)$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb) \
+))
+
+$(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb
+	$(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
+
+$(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm
+	cat $< | tr -d "\015" | \
+		sed 's/%PREFIX/$(UNIXFILENAME.$*)/g' >> $@
+
+$(deb_WORKDIR)/%/DEBIAN/postinst: $(deb_SRCDIR)/postinst
+	cat $< | tr -d "\015" | \
+		sed 's/%PREFIX/$(UNIXFILENAME.$*)/g' >> $@
+
+$(deb_WORKDIR)/%/DEBIAN/prerm: $(deb_SRCDIR)/prerm
+	cat $< | tr -d "\015" | \
+		sed 's/%PREFIX/$(UNIXFILENAME.$*)/g' >> $@
+
+$(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
+	mkdir -p $(deb_WORKDIR)/$*/usr/lib/menu
+	cd $(call gb_CustomTarget_get_workdir,sysui/share)/$* \
+		&& DESTDIR=$(deb_WORKDIR)/$* \
+		ICON_PREFIX=$(UNIXFILENAME.$*) \
+		KDEMAINDIR=/usr \
+		GNOMEDIR=/usr \
+		./create_tree.sh
+	sed $(deb_SRCDIR)/openoffice.org-debian-menus \
+		-e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
+		-e 's/%PREFIX/$(UNIXFILENAME.$*)/' \
+		-e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \
+		> $(deb_WORKDIR)/$*/usr/lib/menu/$*
+	echo "Package: $*" >$@
+	cat $< | tr -d "\015" | \
+		sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
+		>> $@
+	echo "Version: $(PKGVERSION)-$(LIBV_VERSION_PATCH)" >>$@
+	du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@
+
+$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call gb_Library_get_target,getuid)
+
+	chmod -R g-w $(deb_WORKDIR)/$*
+	chmod a+rx $(deb_WORKDIR)/$*/DEBIAN \
+		$(deb_WORKDIR)/$*/DEBIAN/pre* $(deb_WORKDIR)/$*/DEBIAN/post*
+	chmod g-s $(deb_WORKDIR)/$*/DEBIAN
+	LD_PRELOAD=$(call gb_Library_get_target,getuid) \
+		   dpkg-deb --build $(deb_WORKDIR)/$* $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk
new file mode 100644
index 0000000..64419ba
--- /dev/null
+++ b/sysui/CustomTarget_infoplist.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+info_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/infoplist)
+info_SRCDIR := $(SRCDIR)/sysui/desktop/macosx
+
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/infoplist))
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/infoplist,\
+	PkgInfo \
+	Info.plist \
+	$(foreach lang,en-US $(gb_WITH_LANG),\
+	InfoPlist_$(lang).zip InfoPlist_$(lang)/InfoPlist.strings) \
+))
+
+$(info_WORKDIR)/PkgInfo:
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	echo "APPLLIBO" > $@
+
+$(info_WORKDIR)/Info.plist: $(info_SRCDIR)/Info.plist
+	sed -e "s|\%EXECUTABLE|soffice|g" $< > $@
+
+$(info_WORKDIR)/InfoPlist_%.zip: $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
+	zip -j $@ $<
+
+$(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: $(info_WORKDIR)/Info.plist $(call gb_CustomTarget_get_workdir,sysui/share)/documents.ulf
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(PERL) -w $(info_SRCDIR)/gen_strings.pl -l $* -p $^ | \
+	iconv -f UTF-8 -t UTF-16 >$@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
new file mode 100644
index 0000000..8d6c433
--- /dev/null
+++ b/sysui/CustomTarget_rpm.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+rpm_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/rpm)
+rpm_SRCDIR := $(SRCDIR)/sysui/desktop
+
+RPMDISTROS := suse mandriva freedesktop
+
+define rpm_register_target
+$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
+
+$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
+$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm: $(rpm_SRCDIR)/$(2)/$(2)-menus.spec $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh
+	$(RPM) -bb $$< \
+	--buildroot $(rpm_WORKDIR)/$(1)/$(2) \
+	--define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
+	--define "_rpmdir $(rpm_WORKDIR)/$(1)" \
+	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+	--define "productname $(PRODUCTNAME.$(1))" \
+	--define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
+	--define "unixfilename $(UNIXFILENAME.$(1))" \
+	--define "productversion $(PRODUCTVERSION)" \
+	--define "iconprefix $(UNIXFILENAME.$(1))" \
+	--define "version $(PKGVERSION)" \
+	--define "release $(LIBO_VERSION_PATCH)" \
+	--define "__debug_install_post %nil"
+endef
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/rpm))
+
+
+$(foreach product,$(PRODUCTLIST),\
+$(foreach distro,$(RPMDISTROS),\
+$(eval $(call rpm_register_target,$(product),$(distro)))))
+
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/rpm,\
+$(foreach product,$(PRODUCTLIST),\
+	$(product)-desktop-integration.tar.gz) \
+))
+
+$(rpm_WORKDIR)/%-desktop-integration.tar.gz:
+	$(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
new file mode 100644
index 0000000..4a0499e
--- /dev/null
+++ b/sysui/CustomTarget_share.mk
@@ -0,0 +1,227 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
+share_SRCDIR := $(SRCDIR)/sysui/desktop
+
+LAUNCHERLIST_APPS := writer calc draw impress math base printeradmin startcenter
+LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart javafilter xsltfilter
+LAUNCHERS := $(foreach launcher,$(LAUNCHERLIST),$(share_SRCDIR)/menus/$(launcher).desktop)
+
+MIMELIST := \
+    text \
+    text-template \
+    spreadsheet \
+    spreadsheet-template \
+    drawing \
+    drawing-template \
+    presentation \
+    presentation-template \
+    formula \
+    master-document \
+    oasis-text \
+    oasis-text-template \
+    oasis-text-flat-xml \
+    oasis-spreadsheet \
+    oasis-spreadsheet-template \
+    oasis-spreadsheet-flat-xml \
+    oasis-drawing \
+    oasis-drawing-template \
+    oasis-drawing-flat-xml \
+    oasis-presentation \
+    oasis-presentation-template \
+    oasis-presentation-flat-xml \
+    oasis-formula \
+    oasis-master-document \
+    oasis-database \
+    oasis-web-template \
+    ms-excel-sheet-12 \
+    ms-excel-sheet \
+    ms-excel-template-12 \
+    ms-powerpoint-presentation-12 \
+    ms-powerpoint-presentation \
+    ms-powerpoint-template-12 \
+    ms-word-document-12 \
+    ms-word-document \
+    ms-word-document2 \
+    ms-word-template-12 \
+    openxmlformats-officedocument-presentationml-presentation \
+    openxmlformats-officedocument-presentationml-template \
+    openxmlformats-officedocument-spreadsheetml-sheet \
+    openxmlformats-officedocument-spreadsheetml-template \
+    openxmlformats-officedocument-wordprocessingml-document \
+    openxmlformats-officedocument-wordprocessingml-template \
+    ms-excel-sheet-binary-12	\
+    extension
+
+MIMEICONLIST := \
+    oasis-text \
+    oasis-text-template \
+    oasis-spreadsheet \
+    oasis-spreadsheet-template \
+    oasis-drawing \
+    oasis-drawing-template \
+    oasis-presentation \
+    oasis-presentation-template \
+    oasis-formula \
+    oasis-master-document \
+    oasis-database \
+    oasis-web-template \
+    text \
+    text-template \
+    spreadsheet \
+    spreadsheet-template \
+    drawing \
+    drawing-template \
+    presentation \
+    presentation-template \
+    formula \
+    master-document \
+    database \
+    extension
+
+share_ICONS := $(foreach size,16x16 32x32 48x48,\
+	$(foreach contrast,hicolor locolor,\
+	$(foreach app,$(LAUNCHERLIST_APPS),\
+	$(share_SRCDIR)/icons/$(contrast)/$(size)/apps/$(app).png) \
+	$(foreach mime,$(MIMEICONLIST),\
+	$(share_SRCDIR)/icons/$(contrast)/$(size)/mimetypes/$(mime).png)))
+
+MIMEKEYS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).keys)
+MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).desktop)
+ULFS := documents.ulf \
+	launcher_comment.ulf \
+	launcher_genericname.ulf \
+	launcher_unityquicklist.ulf \
+	launcher_name.ulf
+
+
+PRODUCTLIST := libreoffice lodev oxygenoffice
+PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
+PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
+PRODUCTNAME.libreoffice := LibreOffice
+PRODUCTNAME.lodev := LibreOfficeDev
+PRODUCTNAME.oxygenoffice := OxygenOffice
+UNIXFILENAME.libreoffice := $(PRODUCTNAME.libreoffice)$(PRODUCTVERSION)
+UNIXFILENAME.lodev := $(PRODUCTNAME.lodev)$(PRODUCTVERSION)
+UNIXFILENAME.oxygenoffice := $(PRODUCTNAME.oxygenoffice)$(PRODUCTVERSION)
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/share,\
+	$(ULFS) \
+	$(foreach product,$(PRODUCTLIST),\
+	$(product)/build.flag \
+	$(product)/openoffice.org.xml \
+	$(product)/openoffice.mime \
+	$(product)/openoffice.applications \
+	$(product)/openoffice.keys \
+	$(product)/openoffice.sh \
+	$(product)/printeradmin.sh \
+	$(product)/create_tree.sh \
+	$(product)/mimelnklist \
+	$(product)/launcherlist) \
+))
+
+$(share_WORKDIR)/%/openoffice.org.xml: $(share_WORKDIR)/documents.ulf $(MIMEDESKTOPS) $(share_SRCDIR)/share/create_mime_xml.pl
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(PERL) $(share_SRCDIR)/share/create_mime_xml.pl $< > $@
+
+
+$(share_WORKDIR)/%/openoffice.keys:  \
+	$(share_SRCDIR)/mimetypes/openoffice.mime $(MIMEKEYS) $(share_SRCDIR)/share/brand.pl \
+	$(share_SRCDIR)/share/translate.pl  $(share_WORKDIR)/documents.ulf
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
+		--iconprefix $(UNIXFILENAME.$*) $^ $(share_WORKDIR)/$*
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $* -d $(share_WORKDIR)/$* \
+		--ext "keys" --key "description" $(share_WORKDIR)/documents.ulf
+	cat $(MIMEKEYS) > $@
+
+$(share_WORKDIR)/%/mimelnklist: $(MIMEDESKTOPS) $(share_SRCDIR)/share/brand.pl \
+	$(share_SRCDIR)/share/translate.pl $(share_WORKDIR)/documents.ulf
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
+		--iconprefix $(UNIXFILENAME.$*) $^ $(share_WORKDIR)/$*
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $* -d $(share_WORKDIR)/$* \
+		--ext "desktop" --key "Comment" $(share_WORKDIR)/documents.ulf
+	echo "$(MIMEDESKTOPS)" > $@
+
+$(share_WORKDIR)/%/openoffice.mime: $(share_SRCDIR)/mimetypes/openoffice.mime
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
+	cat $< | tr -d "\015" > $@
+
+$(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
+	cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@
+
+$(share_WORKDIR)/%/printeradmin.sh: $(share_SRCDIR)/share/printeradmin.sh
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
+	cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@
+
+$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_WORKDIR)/%/mimelnklist $(share_WORKDIR)/%/printeradmin.sh \
+	$(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
+	$(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
+	echo "#!/bin/sh" > $@
+	echo "PREFIX=$(UNIXFILENAME.$*)" >> $@
+	echo "ICON_PREFIX=$(UNIXFILENAME.$*)" >> $@
+	echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@
+	echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@
+	cat $< >> $@
+	chmod 774 $@
+
+
+$(share_WORKDIR)/%/launcherlist: $(LAUNCHERS)
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	echo "$(addsuffix .desktop,$(filter-out qstart,$(LAUNCHERLIST)))" > $@
+
+
+$(share_WORKDIR)/%/openoffice.applications: $(share_SRCDIR)/mimetypes/openoffice.applications
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
+	cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$*)/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION.$*)/" > $@
+
+$(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
+	$(share_SRCDIR)/share/translate.pl  $(addprefix $(share_WORKDIR)/,$(ULFS))
+	mkdir -p $(dir $@)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(PERL) $(share_SRCDIR)/share/brand.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -u '$$(UNIXPRODUCTNAME)$$(BRANDPACKAGEVERSION)' \
+		--iconprefix '$$(UNIXBASISROOTNAME)' $^ $(share_WORKDIR)/$*
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
+		--ext "desktop" --key "Name" $(share_WORKDIR)/launcher_name.ulf
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
+		--ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
+		--ext "desktop" --key "GenericName" $(share_WORKDIR)/launcher_genericname.ulf
+	$(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \
+		--ext "desktop" --key "UnityQuickList" $(share_WORKDIR)/launcher_unityquicklist.ulf
+	touch $@
+
+ifneq ($(WITH_LANG),)
+$(share_WORKDIR)/%.ulf: $(share_SRCDIR)/desktop/share/%.ulf | $(call gb_Executable_get_runtime_dependencies,ulfex)
+	$(call gb_Output_announce,$@,$(true),SUM,1)
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \
+	$(call gb_Helper_abbreviate_dirs,\
+	$(call gb_Executable_get_command,ulfex) -p sysui -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
+	rm -rf $${MERGEINPUT}
+else
+$(share_WORKDIR)/%.ulf: $(share_SRCDIR)/share/%.ulf
+	cp $< $@
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk
new file mode 100644
index 0000000..75daa65
--- /dev/null
+++ b/sysui/CustomTarget_slackware.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+slack_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/slackware)
+slack_SRCDIR := $(SRCDIR)/sysui/desktop/slackware
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/slackware))
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/slackware,\
+	empty.tar \
+$(foreach product,$(PRODUCTLIST),\
+	$(product)/install/doinst.sh \
+	$(product)/install/slack-desc \
+	$(product)$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz) \
+))
+
+
+$(slack_WORKDIR)/empty.tar:
+	mkdir $(slack_WORKDIR)/empty
+	$(GNUTAR) -C $(slack_WORKDIR)/empty --owner=root $(if $(filter-out MACOSX,$(OS)),--group=root) --same-owner -cf $@ .
+
+$(slack_WORKDIR)/%/install/doinst.sh: $(slack_SRCDIR)/update-script $(call gb_CustomTarget_get_workdir,sysui/share)/%/launcherlist
+	echo "( cd etc; rm -rf $(UNIXFILENAME.$*) )" > $@
+	echo "( cd etc; ln -snf /opt/$(UNIXFILENAME.$*) $(UNIXFILENAME.$*) )" >> $@
+	echo "( cd usr/bin; rm -rf soffice )" >> $@
+	echo "( cd usr/bin; ln -sf /etc/$(UNIXFILENAME.$*)/program/soffice soffice )" >> $@
+	for i in `cat $(call gb_CustomTarget_get_workdir,sysui/share)/$*/launcherlist`; do \
+	echo "(cd usr/share/applications; rm -rf $(UNIXFILENAME.$*)-$$i)" >> $@; \
+	echo "(cd usr/share/applications; ln -sf /etc/$(UNIXFILENAME.$*)/share/xdg/$$i $(UNIXFILENAME.$*)-$$i)" >> $@; \
+		done
+	cat $< >> $@
+
+$(slack_WORKDIR)/%/install/slack-desc: $(slack_SRCDIR)/slack-desc
+	sed -e "s/PKGNAME/$*-slackware-menus/g" \
+	-e "s/PKGVERSION/$(PKGVERSION)/g" \
+	-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/g" \
+	-e "s/PRODUCTNAME/$(PRODUCTNAME.$*)/g" \
+	-e "s/UNIXFILENAME/$(UNIXFILENAME.$*)/g" \
+		$< > $@
+
+$(slack_WORKDIR)/%$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz: $(slack_WORKDIR)/empty.tar $(slack_WORKDIR)/%/install/doinst.sh $(slack_WORKDIR)/%/install/slack-desc $(call gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
+	cd $(call gb_CustomTarget_get_workdir,sysui/share)/$* \
+           && DESTDIR=$(slack_WORKDIR)/$* \
+           ICON_PREFIX=$(UNIXFILENAME.$*) \
+           KDEMAINDIR=/opt/kde \
+           GNOMEDIR="" \
+           ./create_tree.sh
+	cp $(slack_WORKDIR)/empty.tar $@.tmp
+	$(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out MACOSX,$(OS)),--group=root) --same-owner \
+		-rf $@.tmp install usr opt
+	gzip < $@.tmp > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
new file mode 100644
index 0000000..8d9210c
--- /dev/null
+++ b/sysui/CustomTarget_solaris.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+solaris_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/solaris)
+solaris_SRCDIR := $(SRCDIR)/sysui/desktop/solaris
+
+$(eval $(call gb_CustomTarget_CustomTarget,sysui/solaris))
+
+$(eval $(call gb_CustomTarget_register_targets,sysui/solaris,\
+$(foreach product,$(PRODUCTLIST),\
+	$(product)/pkginfo \
+	$(product)/depend \
+	$(product)/mailcap \
+	$(product)/copyright \
+	$(product)/postinstall \
+	$(product)/postremove \
+	$(product)/prototype \
+	$(product)-desktop-integration.tar.gz) \
+))
+
+
+$(solaris_WORKDIR)/%/pkginfo: $(solaris_SRCDIR)/pkginfo
+	cat $< | tr -d "\015" | sed -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/g"  -e "s/%pkgprefix/$*/g" > $@
+
+$(solaris_WORKDIR)/%/depend: $(solaris_SRCDIR)/depend
+	cat $< | tr -d "\015" | sed -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/g"  -e "s/%pkgprefix/$*/g" > $@
+
+$(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/mailcap
+	cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@
+
+$(solaris_WORKDIR)/%/copyright: $(solaris_SRCDIR)/copyright
+	cat $< | tr -d "\015" > $@
+
+$(solaris_WORKDIR)/%/postinstall: $(solaris_SRCDIR)/postinstall
+	cat $< | tr -d "\015" > $@
+
+$(solaris_WORKDIR)/%/postremove: $(solaris_SRCDIR)/postremove
+	cat $< | tr -d "\015" > $@
+
+$(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/prototype
+	cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" -e "s_%SOURCE_$(call gb_CustomTarget_get_workdir,sysui/share)/$*_g" -e "s/%ICONPREFIX/$(UNIXFILENAME.$*)/g" > $@
+
+$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/copyright $(solaris_WORKDIR)/pkginfo $(solaris_WORKDIR)/depend $(solaris_WORKDIR)/mailcap $(solaris_WORKDIR)/postinstall $(solaris_WORKDIR)/postremove $(solaris_WORKDIR)/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
+	pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*)
+	$(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Makefile b/sysui/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/sysui/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
new file mode 100644
index 0000000..9c5c76a
--- /dev/null
+++ b/sysui/Module_sysui.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,sysui))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,sysui,\
+	CustomTarget_share \
+	CustomTarget_slackware \
+	Package_share \
+	Package_desktop \
+	$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \
+	$(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \
+	$(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \
+))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,sysui,\
+	Zip_osxicons \
+	CustomTarget_infoplist \
+	Package_infoplist \
+))
+endif
+else # OS=WNT
+$(eval $(call gb_Module_add_targets,sysui,\
+	Package_icons \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk
new file mode 100644
index 0000000..80e71ba
--- /dev/null
+++ b/sysui/Package_desktop.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget))
+
+ifneq ($(filter deb,$(PKGFORMAT)),)
+$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/deb,\
+	$(foreach product,$(PRODUCTLIST),\
+	sysui/deb/$(product)-desktop-integration.tar.gz) \
+))
+endif
+
+ifneq ($(filter rpm,$(PKGFORMAT)),)
+$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/rpm,\
+	$(foreach product,$(PRODUCTLIST),\
+	sysui/rpm/$(product)-desktop-integration.tar.gz) \
+))
+endif
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/pkg,\
+	$(foreach product,$(PRODUCTLIST),\
+	sysui/solaris/$(product)-desktop-integration.tar.gz) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk
new file mode 100644
index 0000000..2435b86
--- /dev/null
+++ b/sysui/Package_icons.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,sysui/icons,$(SRCDIR)/sysui/desktop/icons))
+
+$(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico))
+
+$(eval $(call gb_Package_add_files,sysui/icons,res/icons,\
+	oasis-database.ico \
+	oasis-drawing-template.ico \
+	oasis-drawing.ico \
+	oasis-empty-template.ico \
+	oasis-empty-document.ico \
+	oasis-formula.ico \
+	oasis-master-document.ico \
+	oasis-presentation-template.ico \
+	oasis-presentation.ico \
+	oasis-spreadsheet-template.ico \
+	oasis-spreadsheet.ico \
+	oasis-text-template.ico \
+	oasis-text.ico \
+	oasis-web-template.ico \
+	database.ico \
+	drawing-template.ico \
+	drawing.ico \
+	empty-template.ico \
+	empty-document.ico \
+	formula.ico \
+	master-document.ico \
+	presentation-template.ico \
+	presentation.ico \
+	spreadsheet-template.ico \
+	spreadsheet.ico \
+	text-template.ico \
+	text.ico \
+	impress_app.ico \
+	calc_app.ico \
+	draw_app.ico \
+	base_app.ico \
+	writer_app.ico \
+	math_app.ico \
+	main_app.ico \
+	open.ico \
+	oxt-extension.ico \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
new file mode 100644
index 0000000..27d317e
--- /dev/null
+++ b/sysui/Package_infoplist.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist)))
+
+$(eval $(call gb_Package_add_files,infoplist,pck,\
+	PkgInfo \
+	Info.plist \
+))
+
+$(eval $(call gb_Package_add_files,infoplist,bin,\
+	$(foreach lang,en-US $(gb_WITH_LANG),InfoPlist_$(lang).zip) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk
new file mode 100644
index 0000000..eb94e7e
--- /dev/null
+++ b/sysui/Package_share.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,share,$(SRCDIR)/sysui/desktop/menus))
+
+$(eval $(call gb_Package_add_files,share,pck,\
+	$(addsuffix .desktop,$(LAUNCHERLIST)) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk
new file mode 100644
index 0000000..62eff41
--- /dev/null
+++ b/sysui/Zip_osxicons.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+osxicons_LIST := $(shell $(PERL) -w $(SRCDIR)/sysui/desktop/macosx/list_icons.pl < $(SRCDIR)/sysui/desktop/macosx/Info.plist)
+
+$(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
+
+$(eval $(call gb_Zip_add_files,osxicons,\
+	$(addprefix icons/,$(osxicons_LIST)) \
+	macosx/Info.plist \
+	macosx/extract_icons_names.pl \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/sysui/desktop/cleanversion/makefile.mk b/sysui/desktop/cleanversion/makefile.mk
deleted file mode 100644
index 48416ac..0000000
--- a/sysui/desktop/cleanversion/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=cleanversion
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE : target.mk
-
-ALLTAR: $(MISC)$/cleanup.flag
-
-# imagine where rm is acting if MISC is empty...
-.IF "$(MISC)"!=""
-
-# version changed - bin previous trees
-$(MISC)$/cleanup.flag : ..$/productversion.mk
-    rm -rf `ls -d $(MISC)$/* | sed '/\/logs$/d'` && $(TOUCH) $@
-    
-.ENDIF			# "$(MISC)"!=""
-    
-
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
deleted file mode 100644
index d61436e..0000000
--- a/sysui/desktop/debian/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=debian
-
-# !!! FIXME !!!
-# debian-menus file.
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i$(PRODUCTVERSION)-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-
-ALLTAR : $(DEBFILES) 
-
-
-%/DEBIAN/control : $$(@:f)
-    @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-    ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)) $*$/etc$/
-    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//)
-    echo "Package: $(*:f:s/_/ /:1:s/$(PRODUCTVERSION)//)" > $@
-    cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/" >> $@
-    echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))-$(PKGREV)" >> $@
-    @du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
-
-%/DEBIAN/postinst : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" > $@
-
-%/DEBIAN/postrm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" > $@
-
-%/DEBIAN/prerm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" > $@
-
-# --- packaging ---------------------------------------------------
-
-# getuid.so fakes the user/group for us	
-$(DEBFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-$(DEBFILES) : makefile.mk control postinst postrm prerm
-    -$(RM) $(@:d)$(@:f:s/_/ /:1)_*
-    $(RM) -r $(MISC)$/$(@:b)
-    dmake $(MISC)$/$(@:b)$/DEBIAN$/{control postinst postrm prerm} 
-    @chmod -R g-w $(MISC)$/$(@:b)
-    @chmod a+rx $(MISC)$/$(@:b)$/DEBIAN $(MISC)/$(@:b)/DEBIAN/post* $(MISC)/$(@:b)/DEBIAN/pre*
-    @chmod g-s $(MISC)/$(@:b)/DEBIAN
-    @mkdir -p $(PKGDIR)
-    /bin/bash -c "LD_PRELOAD=$(SOLARBINDIR)/getuid.so dpkg-deb --build $(MISC)/$(@:b) $@" 
-    $(RM) -r $(MISC)$/$(@:b)
-#	@chmod -R g+w $(MISC)/$(TARGET)/$(DEBFILE:f)
-
-.ENDIF
diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk
deleted file mode 100644
index 28572c7..0000000
--- a/sysui/desktop/freedesktop/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=freedesktop
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
- 
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-SPECFILE=$(TARGET)-menus.spec
-RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : ../tg_rpm.mk
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-
-.ENDIF
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
deleted file mode 100644
index 2a9d633..0000000
--- a/sysui/desktop/icons/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=icons
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Targets -------------------------------------------------------------
-
-all: \
-    $(MISC)$/oasis-database.ico \
-    $(MISC)$/oasis-drawing-template.ico \
-    $(MISC)$/oasis-drawing.ico \
-    $(MISC)$/oasis-empty-template.ico \
-    $(MISC)$/oasis-empty-document.ico \
-    $(MISC)$/oasis-formula.ico \
-    $(MISC)$/oasis-master-document.ico \
-    $(MISC)$/oasis-presentation-template.ico \
-    $(MISC)$/oasis-presentation.ico \
-    $(MISC)$/oasis-spreadsheet-template.ico \
-    $(MISC)$/oasis-spreadsheet.ico \
-    $(MISC)$/oasis-text-template.ico \
-    $(MISC)$/oasis-text.ico \
-    $(MISC)$/oasis-web-template.ico \
-    $(MISC)$/database.ico \
-    $(MISC)$/drawing-template.ico \
-    $(MISC)$/drawing.ico \
-    $(MISC)$/empty-template.ico \
-    $(MISC)$/empty-document.ico \
-    $(MISC)$/formula.ico \
-    $(MISC)$/master-document.ico \
-    $(MISC)$/presentation-template.ico \
-    $(MISC)$/presentation.ico \
-    $(MISC)$/spreadsheet-template.ico \
-    $(MISC)$/spreadsheet.ico \
-    $(MISC)$/text-template.ico \
-    $(MISC)$/text.ico \
-    $(MISC)$/impress_app.ico \
-    $(MISC)$/calc_app.ico \
-    $(MISC)$/draw_app.ico \
-    $(MISC)$/base_app.ico \
-    $(MISC)$/writer_app.ico \
-    $(MISC)$/math_app.ico \
-    $(MISC)$/main_app.ico \
-    $(MISC)$/open.ico \
-    $(MISC)$/oxt-extension.ico
-
-$(MISC)$/%.ico: %.ico
-    $(COPY) $< $@
-
-.INCLUDE :  target.mk
diff --git a/sysui/desktop/macosx/delzip b/sysui/desktop/macosx/delzip
deleted file mode 100755
index e69de29..0000000
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
deleted file mode 100644
index 871c77e..0000000
--- a/sysui/desktop/macosx/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-TARGET=desktopmacosx
-
-# --- Settings -------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files ----------------------------------------------------
-
-.IF "$(OS)"!="MACOSX"
-
-dummy:
-# nothing
-
-.ELSE           # "$(OS)"!="MACOSX"
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxicons
-ZIP1DIR = ../icons
-ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist)
-
-CREATOR_TYPE=LIBO
-EXECUTABLE=soffice
-
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/desktopshare
-.ELSE # "$(WITH_LANG)"!=""
-ULFDIR:=..$/share
-.ENDIF # "$(WITH_LANG)"!=""
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ZIP1TARGETN)"!=""
-ZIP1TARGETN : Info.plist extract_icons_names.pl
-
-.ENDIF          # "$(ZIP1TARGETN)"!=""
-
-ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} $(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip
-
-$(COMMONMISC)$/PkgInfo :
-    echo "APPL$(CREATOR_TYPE)" > $@
-
-
-$(COMMONMISC)$/Info.plist : $$(@:f)
-    sed -e "s|\%EXECUTABLE|${EXECUTABLE}|g" $< > $@
-
-$(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip : $(COMMONMISC)$/$$(@:b)/InfoPlist.strings
-    cd $(<:d) && zip ../$(@:f).$(INPATH) $(<:f)
-    $(MV) -f $(COMMONMISC)$/$(@:f).$(INPATH) $@
-
-$(COMMONMISC)$/InfoPlist_{$(alllangiso)}$/InfoPlist.strings : Info.plist $(ULFDIR)$/documents.ulf
-    $(MKDIRHIER) $(@:d)
-    $(PERL) -w gen_strings.pl -l $(@:d:d:b:s/InfoPlist_//) -p $< | iconv -f UTF-8 -t UTF-16 > $@.$(INPATH)
-    $(MV) -f $@.$(INPATH) $@
-    
-.ENDIF		# "$(OS)"!="MACOSX"	
-
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
deleted file mode 100644
index a3aa4c1..0000000
--- a/sysui/desktop/mandriva/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=mandriva
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
- 
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-SPECFILE=$(TARGET)-menus.spec
-RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : ../tg_rpm.mk
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-
-.ENDIF
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
deleted file mode 100644
index 1338f28..0000000
--- a/sysui/desktop/productversion.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-.IF "$(OS)"=="LINUX"
-PKGREV          = $(BUILD)
-.ELSE
-PKGREV          = $(LAST_MINOR:s/m//:s/s/./)
-.ENDIF
-
-ABSLOCALOUT:=$(shell @cd $(PRJ) && pwd)$/$(ROUT)
-
-# create desktop-integration subfolder on linux
-.IF "$(OS)"=="LINUX" || "$(OS)"=="AIX"
-# rpm seems to require absolute paths here :(
-PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration
-RPMMACROS= \
-    --define "_rpmdir $(PKGDIR)" \
-    --define "_rpmfilename %%{{NAME}}-%%{{VERSION}}-%%{{RELEASE}}.%%{{ARCH}}.rpm"
-.ELSE
-PKGDIR=$(BIN)
-.ENDIF
-
-.INCLUDE : productversion.mk
-
-PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO)
-
-# gnome-vfs treats everything behind the last '.' as an icon extension, 
-# even though the "icon_filename" in '.keys' is specified as filename 
-# without extension. Since it also does not know how to handle "2-writer"
-# type icons :-), we are stripping all '.' for now.
-# ToDo: maybe we use a product major later ??
-ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g)
-# UNIXWRAPPERNAME variable is used to generate the common desktop files below share/xdg;
-# the default values get replaced by make_installer.pl at (core0x) packaging time;
-# another wrapper name can be forced by --with-unix-wrapper configure option
-# which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366
-.IF "$(UNIXWRAPPERNAME)" == ""
-UNIXWRAPPERNAME = '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
-.ENDIF
-
-# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.libreoffice = LibreOffice
-PRODUCTVERSION.libreoffice = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT)
-PKGVERSION.libreoffice = $(PKGVERSION)
-UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)$(PRODUCTVERSION.libreoffice)
-ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice)
-
-PRODUCTNAME.lodev = LibreOfficeDev
-PRODUCTVERSION.lodev = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.lodev = $(PRODUCTVERSIONSHORT)
-PKGVERSION.lodev = $(PKGVERSION)
-UNIXFILENAME.lodev = lodev$(PRODUCTVERSION.lodev)
-ICONPREFIX.lodev = $(UNIXFILENAME.lodev)
-
-PRODUCTNAME.oxygenoffice = OxygenOffice
-PRODUCTVERSION.oxygenoffice = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.oxygenoffice = $(PRODUCTVERSIONSHORT)
-PKGVERSION.oxygenoffice = $(PKGVERSION)
-UNIXFILENAME.oxygenoffice = $(PRODUCTNAME.oxygenoffice:l)$(PRODUCTVERSION.oxygenoffice)
-ICONPREFIX.oxygenoffice = $(UNIXFILENAME.oxygenoffice)
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 882dcbf..ef9f32a 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # This file is part of the LibreOffice project.
 #
@@ -33,7 +32,7 @@ if [ "${KDEMAINDIR}" ]; then
 
   mkdir -p "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application"
   for i in `cat mimelnklist`; do
-    cp "${i}" "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-${i}"
+    cp "${i}" "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-`basename ${i}`"
   done
   chmod 0644 "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/"*
 fi
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
deleted file mode 100644
index 21c919a..0000000
--- a/sysui/desktop/share/makefile.mk
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=desktopshare
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(WITH_LANG)"!=""
-ULFDIR:=$(COMMONMISC)$/$(TARGET)
-.ELSE			# "$(WITH_LANG)"!=""
-ULFDIR:=.
-.ENDIF			# "$(WITH_LANG)"!=""
-
-ULFFILES= \
-    documents.ulf \
-    launcher_comment.ulf \
-    launcher_genericname.ulf \
-    launcher_unityquicklist.ulf \
-    launcher_name.ulf
-
-LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
-LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter xsltfilter
-LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
-
-LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
-
-MIMELIST = \
-    text \
-    text-template \
-    spreadsheet \
-    spreadsheet-template \
-    drawing \
-    drawing-template \
-    presentation \
-    presentation-template \
-    formula \
-    master-document \
-    oasis-text \
-    oasis-text-template \
-    oasis-text-flat-xml \
-    oasis-spreadsheet \
-    oasis-spreadsheet-template \
-    oasis-spreadsheet-flat-xml \
-    oasis-drawing \
-    oasis-drawing-template \
-    oasis-drawing-flat-xml \
-    oasis-presentation \
-    oasis-presentation-template \
-    oasis-presentation-flat-xml \
-    oasis-formula \
-    oasis-master-document \
-    oasis-database \
-    oasis-web-template \
-    ms-excel-sheet-12 \
-    ms-excel-sheet \
-    ms-excel-template-12 \
-    ms-powerpoint-presentation-12 \
-    ms-powerpoint-presentation \
-    ms-powerpoint-template-12 \
-    ms-word-document-12 \
-    ms-word-document \
-    ms-word-document2 \
-    ms-word-template-12 \
-    openxmlformats-officedocument-presentationml-presentation \
-    openxmlformats-officedocument-presentationml-template \
-    openxmlformats-officedocument-spreadsheetml-sheet \
-    openxmlformats-officedocument-spreadsheetml-template \
-    openxmlformats-officedocument-wordprocessingml-document \
-    openxmlformats-officedocument-wordprocessingml-template \
-    ms-excel-sheet-binary-12	\
-    extension
-
-MIMEICONLIST = \
-    oasis-text \
-    oasis-text-template \
-    oasis-spreadsheet \
-    oasis-spreadsheet-template \
-    oasis-drawing \
-    oasis-drawing-template \
-    oasis-presentation \
-    oasis-presentation-template \
-    oasis-formula \
-    oasis-master-document \
-    oasis-database \
-    oasis-web-template \
-    text \
-    text-template \
-    spreadsheet \
-    spreadsheet-template \
-    drawing \
-    drawing-template \
-    presentation \
-    presentation-template \
-    formula \
-    master-document \
-    database \
-    extension
-
-ICONDEPN = \
-	   ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST_APPS)}.png \
-    ../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \
-    ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST_APPS)}.png \
-    ../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(OS)"!="WNT"
-ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-
-.ENDIF          # "$(OS)"!="WNT"
-
-#
-# Copy/patch the .desktop files to the output tree and 
-# merge-in the translations. 
-#
-
-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
-$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
-    @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
-    @echo Creating desktop entries for $(@:f) ..
-    @echo ---------------------------------
-    @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{UNIXBASISROOTNAME}}-' $< $(@:db).$(INPATH).$(@:f)
-    @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
-    @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
-    @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
-    @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "UnityQuicklist" $(ULFDIR)$/launcher_unityquicklist.ulf
-.IF "$(WITH_LIBSN)"=="YES"
-    @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
-.ENDIF
-    @$(MV) -f $(@:db).$(INPATH).$(@:f)/* $(@:d)
-    @rmdir $(@:db).$(INPATH).$(@:f)
-    @touch $@
-
-#
-# Create shared mime info xml file
-#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : ../mimetypes/{$(MIMELIST)}.desktop create_mime_xml.pl
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf
-    @echo Create shared mime info xml file ..
-    @echo ---------------------------------
-    @$(PERL) create_mime_xml.pl $< > $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-#
-# Create GNOME mime-info files
-#
-
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/openoffice.mime brand.pl translate.pl ../productversion.mk $(ULFDIR)$/documents.ulf
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys : ../mimetypes/{$(MIMELIST)}.keys  
-    @@-$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .keys file for $(@:d:d:f) ..
-    @echo ---------------------------------
-    @$(PERL) brand.pl -p $(PRODUCTNAME.$(@:d:d:f)) -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(MISC)/$(@:d:d:f)
-    @$(PERL) translate.pl -p $(PRODUCTNAME.$(@:d:d:f)) -d $(MISC)/$(@:d:d:f) --ext "keys" --key "description" $(ULFDIR)$/documents.ulf
-    @cat $(MISC)/$(@:d:d:f)/{$(MIMELIST)}.keys > $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime : ../mimetypes/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .mime file for $(@:d:d:f) ..
-    @echo ---------------------------------
-    @cat $< | tr -d "\015" > $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications : ../productversion.mk 
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications : ../mimetypes/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    @echo Creating GNOME .applications file for $(@:d:d:f) ..
-    @echo ---------------------------------
-    @cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$(@:d:d:f))/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$(@:d:d:f)) $(PRODUCTVERSION.$(@:d:d:f))/" > $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-#
-# Create KDE mimelnk files
-#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : brand.pl translate.pl ../productversion.mk $(ULFDIR)$/documents.ulf
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.desktop
-    @@-$(MKDIRHIER) $(@:db).$(INPATH)
-    @echo Creating KDE mimelnk entries for $(@:d:d:f) ..
-    @echo ---------------------------------
-    @$(PERL) brand.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -u $(UNIXFILENAME.$(@:d:d:f)) --iconprefix '$(ICONPREFIX.$(@:d:d:f))-' $< $(@:db).$(INPATH)
-    @$(PERL) ../share/translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/documents.ulf
-    @mv -f $(@:db).$(INPATH)/* $(@:d)
-    @rmdir $(@:db).$(INPATH)
-    @echo  "{$(MIMELIST)}.desktop" > $@
-
-#
-# Generate customized install scripts
-#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : makefile.mk
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    @echo "#!/bin/sh" > $@.$(INPATH)
-    @echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH)
-    @echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH)
-    @echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH)
-    @echo "PRODUCTVERSION=$(PRODUCTVERSION.$(@:d:d:f))" >> $@.$(INPATH)
-    @cat $< >> $@.$(INPATH)
-    @chmod 774 $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-#
-# Create skript files
-#
-
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh : ../productversion.mk
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh : $$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(@:d:d:f))/g" > $@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-#
-# Launcher list
-#
-
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/launcherlist : $(LAUNCHERDEPN)
-    @@-$(MKDIRHIER) $(@:d)
-    @echo "{$(LAUNCHERLIST:s/qstart//)}.desktop" >$@.$(INPATH)
-    @mv -f $@.$(INPATH) $@
-
-#
-# Flagfile
-#
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag : $(ICONDEPN) \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/launcherlist \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.mime \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml	\
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications \
-    $(COMMONMISC)$/{$(PRODUCTLIST)}$/{openoffice printeradmin}.sh
-    @touch $@
-
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 200f6a8..9bb60f2 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -129,8 +129,8 @@ foreach $template (keys %templates) {
             my $translations = $templates{$template}->{'translations'};
             foreach my $locale (keys %{$translations}) {
                 my $value = $translations->{$locale};
-                print "locale is $locale\n";
-                print "value is $value\n";
+                # print "locale is $locale\n";
+                # print "value is $value\n";
                 if ($value) {
                     if ($ext eq "desktop") {
                         print OUTFILE "$outkey\[$locale\]=$value\n";
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
deleted file mode 100644
index 334405f..0000000
--- a/sysui/desktop/slackware/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=slackware
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
-
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}$(PRODUCTVERSION)-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(OS)" == "LINUX"
-
-ALLTAR : $(MENUFILES) 
-
-$(MISC)/$(TARGET)/usr/share/applications/ :
-    @$(MKDIRHIER) $(@)
-    
-# --- slackware-specific stuff ------------------------------------
-# symlinks shall not be included in the tarball, but created with the doinst-script
-
-# FIXME: removal of *-extension.* only to create identical packages to OOF680
-%/usr/share/applications : 
-    @$(MKDIRHIER) $@
-    /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
-    $(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png	
-    $(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop 
-    $(RM) $*$/usr$/share$/applications$/*.desktop
-    $(RM) $*$/usr$/bin$/soffice
-
-%$/install$/doinst.sh : update-script
-    @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)) )" > $@
-    @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)) )" >> $@
-    @echo "( cd usr/bin ; rm -rf soffice )" >> $@
-    @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/program/soffice soffice )" >> $@
-    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))-$i )") >> $@
-    @cat $< >> $@
-
-%$/install$/slack-desc : slack-desc
-    @$(MKDIRHIER) $(@:d)
-    @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" \
-        -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" \
-        -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" \
-        -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/$(PRODUCTVERSION)//))/g" $< > $@
-
-# needed to satisfy the slackware package tools - they need
-# the entries like this
-#       ./              <- very important
-#       directory/file
-# the follwoing does not work (no description found then):
-#       ./
-#       ./directory/file
-# and this doesn't work either (broken file-list, package cannot be removed)
-#       directory/file
-
-$(MISC)/$(TARGET)/empty.tar :
-    @$(MKDIRHIER) $(@:d)/empty
-    @$(GNUTAR) -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ .
-
-
-# --- packaging ---------------------------------------------------
-
-$(MENUFILES) : makefile.mk slack-desc update-script $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-$(MENUFILES) : $(MISC)/$(TARGET)/empty.tar
-    @-$(MKDIRHIER) $(@:d)
-    -$(RM) $(@:d)$/$(@:b:s/-/ /:1)-$(TARGET)-menus-*.tgz 
-    -$(RM) -r $(MISC)$/$(@:b)
-    dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh
-    @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp
-    @$(GNUTAR) -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt
-    @gzip < $@.tmp > $@
-    @$(RM) $@.tmp
-    $(RM) -r $(MISC)$/$(@:b)
-
-.ENDIF
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
deleted file mode 100644
index 3a9e118..0000000
--- a/sysui/desktop/solaris/makefile.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=solaris
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
- 
-.IF "$(OS)"=="SOLARIS"
-
-PKGFILES = $(BIN)$/pkg$/{$(PRODUCTLIST)}-desktop-integration.tar.gz
-   
-PKGDATESTRING = $(shell @date -u +%Y.%m.%d)
-PKGARCH=all
-
-FASPAC=`test -f $(SOLARBINDIR)/faspac-so.sh && echo "/sbin/sh" || echo "echo"`
-
-.ENDIF
-    
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(OS)"=="SOLARIS"
-
-ALLTAR : $(PKGFILES) 
-
-# --- pkginfo ----------------------------------------------------
-
-# Copy the pkginfo file to $(MISC) 
-$(MISC)/{$(PRODUCTLIST)}/{pkginfo depend} : $$(@:f) ../productversion.mk makefile.mk
-    @$(MKDIRHIER) $(@:d)
-    @cat $(@:f) | tr -d "\015" | sed -e "s/%PRODUCTNAME/$(PRODUCTNAME.$(@:d:d:f)) $(PRODUCTVERSION.$(@:d:d:f))/g" -e "s/%pkgprefix/$(@:d:d:f:s/.//)/" > $@
-
-# --- mailcap ---------------------------------
-
-# Copy the prototype file to $(MISC)
-$(MISC)/{$(PRODUCTLIST)}/mailcap : $$(@:f) ../productversion.mk
-    @$(MKDIRHIER) $(@:d)
-    @cat $(@:f) | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(@:d:d:f))/g" -e "s_%SOURCE_$(MISC)/$(@:d:d:f)_g" > $@
-
-# --- copyright--------------------------------
-
-# Copy the copyright file to $(MISC) 
-$(MISC)/{$(PRODUCTLIST)}/copyright : $$(@:f)
-    @$(MKDIRHIER) $(@:d)
-    @cat $(@:f) | tr -d "\015" > $@
-
-# --- postinstall--------------------------------
-
-
-# Copy the postinstall file to $(MISC) 
-$(MISC)/{$(PRODUCTLIST)}/postinstall : $$(@:f)
-    @$(MKDIRHIER) $(@:d)
-    @cat $(@:f) | tr -d "\015" > $@
-
-# --- postremove--------------------------------
-
-# Copy the postremove file to $(MISC) 
-$(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f)
-    @$(MKDIRHIER) $(@:d)
-    @cat $(@:f) | tr -d "\015" > $@
-
-# --- prototype ---------------------------------------------------
-
-# Copy the prototype file to $(MISC)
-$(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk
-    @$(MKDIRHIER) $(@:d)
-    cat $(@:f) | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(@:d:d:f))/g" -e "s_%SOURCE_$(COMMONMISC)/$(@:d:d:f)_g" -e "s/%ICONPREFIX/$(ICONPREFIX.$(@:d:d:f))/g" > $@
-
-# --- packaging ---------------------------------------------------
-
-#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
-$(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
-    @-$(RM) $(BIN)$/$(@:f)
-    @$(MKDIRHIER) $(@:d)
-    pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) 
-.IF "$(DONTCOMPRESS)"==""
-    $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
-.ENDIF # "$(DONTCOMPRESS)"==""
-    @$(GNUTAR) -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@
-    @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
-
-.ENDIF
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
deleted file mode 100644
index 8689137..0000000
--- a/sysui/desktop/suse/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=suse
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Product Version Information ----------------------------------
-
-.INCLUDE :  ../productversion.mk
-
-# --- Files --------------------------------------------------------
- 
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-SPECFILE=$(TARGET)-menus.spec
-RPMFLAGFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i-$(SPECFILE:b)-$(PKGVERSION.$i)-$(PKGREV).noarch.flag)
-
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : ../tg_rpm.mk
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-$(RPMFLAGFILES) : $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-
-.ENDIF
diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
deleted file mode 100644
index e9983ad..0000000
--- a/sysui/desktop/tg_rpm.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-
-ALLTAR : $(RPMFLAGFILES)
-
-$(RPMFLAGFILES) : $(SPECFILE)
-    @-$(MKDIRHIER) $(@:d)
-    -$(RM) $(@:d)$(@:b:s/-/ /:1)-$(SPECFILE:b)-*
-    $(RPM) -bb $< $(RPMMACROS) \
-        --buildroot $(ABSLOCALOUT)$/misc$/$(@:b) \
-        --define "_builddir $(shell @cd $(COMMONMISC)$/$(@:b:s/-/ /:1) && pwd)" \
-        --define "productname $(PRODUCTNAME.$(@:b:s/-/ /:1))" \
-        --define "pkgprefix $(@:b:s/-/ /:1)$(PRODUCTVERSION.$(@:b:s/-/ /:1))" \
-        --define "unixfilename $(UNIXFILENAME.$(@:b:s/-/ /:1))" \
-        --define "productversion $(PRODUCTVERSION.$(@:b:s/-/ /:1))" \
-        --define "iconprefix $(ICONPREFIX.$(@:b:s/-/ /:1))" \
-        --define "version $(PKGVERSION.$(@:b:s/-/ /:1))" \
-        --define "release $(PKGREV)" \
-        --define "__debug_install_post %nil" \
-        --define "_unpackaged_files_terminate_build  0" && $(TOUCH) $@
-.ENDIF
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
deleted file mode 100644
index 6a5b8c0..0000000
--- a/sysui/desktop/util/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..$/..
-
-PRJNAME=sysui
-TARGET=launcher
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  ..$/productversion.mk
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
-RPMTARFILES=$(BIN)$/rpm$/{$(PRODUCTLIST)}-desktop-integration.tar.gz
-.ENDIF
-
-.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBTARFILES=$(BIN)$/deb$/{$(PRODUCTLIST)}-desktop-integration.tar.gz
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR: $(RPMTARFILES) $(DEBTARFILES)
-
-.IF "$(RPMTARFILES)" != ""
-
-$(RPMTARFILES) : $(PKGDIR)
-    $(MKDIRHIER) $(@:d)
-    $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@
-
-.ENDIF # "$(TARFILE)" != ""
-
-.IF "$(DEBTARFILES)" != ""
-
-$(DEBTARFILES) : $(PKGDIR)
-    $(MKDIRHIER) $(@:d)
-    $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.deb)} | gzip > $@
-    
-.ENDIF
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index 0298d91..8b2aa08 100644
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -1,15 +1,2 @@
 su	sysui	:	offapi DESKTOP:l10ntools NULL
-su	sysui\desktop\icons					nmake	-	w	su_iconsw NULL
-su  sysui\desktop\macosx                nmake   -   u   su_dtmacosx su_dtshare.u NULL
-su  sysui\desktop\cleanversion          nmake   -   u   su_dtcleanversion NULL
-su  sysui\desktop\share                 nmake   -   u   su_dtshare su_dtcleanversion.u NULL
-su	sysui\desktop\menus					get     -   all su_dtmenus NULL
-su	sysui\desktop\mimetypes				get     -   all su_dtmime NULL
-su  sysui\desktop\suse                  nmake   -   u   su_dtsuse su_dtshare.u NULL
-su  sysui\desktop\mandriva              nmake   -   u   su_dtmdk su_dtshare.u NULL
-su  sysui\desktop\freedesktop           nmake   -   u   su_dtfreedesktop su_dtshare.u NULL
-su  sysui\desktop\debian                nmake   -   u   su_dtdebian su_dtshare.u NULL
-su  sysui\desktop\slackware             nmake   -   u   su_dtslackware su_dtshare.u NULL
-su  sysui\desktop\solaris               nmake   -   u   su_dtsolaris su_dtshare.u NULL
-su  sysui\desktop\util                  nmake   -   u   su_desktop su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u su_dtslackware.u NULL
-su  sysui\util		                    nmake   -   all su_util su_dtsolaris.u su_desktop.u su_iconsw.w NULL
+su	sysui\prj					nmake	-	w	su_iconsw NULL
diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index ca308e8..e69de29 100644
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %_DEST%\res\icons
-mkdir: %_DEST%\inc\icons
-mkdir: %_DEST%\bin\so
-mkdir: %_DEST%\bin\desktop-integration
-mkdir: %_DEST%\bin\desktop-integration\rpm
-mkdir: %_DEST%\bin\desktop-integration\deb
-mkdir: %_DEST%\bin\desktop-integration\pkg
-
-..\%__SRC%\misc\*.ico %_DEST%\res\icons\*.ico
-..\%__SRC%\misc\*.gif %_DEST%\res\icons\*.gif
-..\%__SRC%\bin\*.zip %_DEST%\bin\*.zip
-..\%__SRC%\bin\*.tar.gz %_DEST%\bin\*.tar.gz
-..\%__SRC%\bin\rpm\*.tar.gz %_DEST%\bin\desktop-integration\rpm\*.tar.gz
-..\%__SRC%\bin\deb\*.tar.gz %_DEST%\bin\desktop-integration\deb\*.tar.gz
-..\%__SRC%\bin\pkg\*.tar.gz %_DEST%\bin\desktop-integration\pkg\*.tar.gz
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-
-..\%__SRC%\misc\main_app.ico %_DEST%\bin\soffice.ico
-
-..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck\*.desktop
-..\%__SRC%\misc\PkgInfo %_DEST%\pck\PkgInfo
-..\%__SRC%\misc\Info.plist %_DEST%\pck\Info.plist
diff --git a/sysui/prj/dmake b/sysui/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl
deleted file mode 100644
index 9daf262..0000000
--- a/sysui/util/checksize.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-#
-#
-#
-
-my
-$is_debug=0;
-my $err = 0;
-my $path = "../" . $ENV{'INPATH'} . "/";
-
-#Path of the directory from which the recursion starts (must have ending '/').
-print "Checking:$path\n";
-# Initiate the recursion
-&RecurseDirs($path);
-if ($err > 0)
-{
-    print "Error: $err damaged files encountered\n";
-    exit(1); # stop dmake
-} else
-{
-    print "ok.\n";
-}
-exit;
-
-#### SUBROUTINES SECTION ####
-
-# Function that recurses through the directory tree calling FileFunction on all files
-sub RecurseDirs {
-    my ($path) = @_;
-    my $file;    #Variable for a file
-
-    opendir (DIRECTORY, $path) or
-        die "Error: Can't read $path\n";
-    my @all_files = grep (!/^\.\.?$/, readdir (DIRECTORY)); #Read all the files except for '.' and '..'
-    closedir (DIRECTORY);
-
-    foreach $file (@all_files) {
-        if (-d "$path$file/") {
-            &RecurseDirs("$path$file/");
-        } else {
-            &check($path, $file);
-        }
-    }
-}
-
-############################################################################
-sub check       #04.02.2005 13:40
-############################################################################
- {
-    my $path = shift;
-    my $file = shift;
-    print "$path$file\n" if ((-e "$path$file") && $is_debug);
-    # don't check dpc,flag,rpmflag,sdf [obj for UNX] files, or etc subdirectory
-    return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{OS} ne 'WNT') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) );
-    if ( -z "$path$file" ) {
-        print "Error: $path$file 0 Bytes!\n";
-        $err++;
-    }
- }
diff --git a/sysui/util/makefile.mk b/sysui/util/makefile.mk
deleted file mode 100644
index 738cbd4..0000000
--- a/sysui/util/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..
-
-PRJNAME=sysui
-TARGET=sysui
-USE_LDUMP2=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)$/checksize.done
-
-$(MISC)$/checksize.done .PHONY:
-    $(PERL) checksize.pl
-


More information about the Libreoffice-commits mailing list