Properly handle language-specific parts of --with-help=html media/ sub-tree

...that previously ended up in language-independent parts of installation sets.

The structure of that media/ tree doesn't allow to directly mis-use the existing
AllLangPackage machinery (which expects the language to be encoded in the first
pathname segment within the tree; and which is already mis-used for the
helpcontent2/AllLangPackage_html_lang.mk parts).

So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the
language explicitly, independent of where it is encoded in the pathname (if at
all).  The underlying gb_AllLangPackage_add_file sets a
gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need
further fixing by anybody actually using that target; see the mail thread
starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html>
"Broken --with-help=html `make packageinfo`".

All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed
in either helpcontent2/Package_html_media.mk (for the language-independent
files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language-
specific files).  Also note the two TODOs in
helpcontent2/AllLangPackage_html_media_lang.mk.

What is not quite right yet is that content from
helpcontent2/AllLangPackage_html_lang.mk and
helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language
helpcontent installation sets (as intended, via the instructions in
helpcontent2/CustomTarget_html.mk) and per-language languagepack installation
sets (which is unintended).  This needs to be fixed with a follow-up commit.

This is the helpcontent2 part of a commit spanning core and helpcontent2.

Change-Id: Ie7916b75eee0dde3106e784d19e99fde5bb93195
Reviewed-on: https://gerrit.libreoffice.org/54749
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 612 insertions, 24 deletions

diff --git a/AllLangPackage_html_media_lang.mk b/AllLangPackage_html_media_lang.mk
new file mode 100644
index 0000000000..45e983a430
--- /dev/null
+++ b/AllLangPackage_html_media_lang.mk
@@ -0,0 +1,250 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
+#
+# 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/.
+#
+
+# Language-specific parts of the help/media/ sub-tree.  All language-specific content from
+# $(SRCDIR)/helpcontent2/source/media/ must be listed here.  Content that is present in $(SRCDIR)
+# for all languages in some set of languages can be handled with a foreach (like the screenshots
+# present for all languages in $(completelangiso) below).  More irregular conent that is present in
+# $(SRCDIR) only for some languages is handled with the individual per-language blocks.
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_media_lang,$(SRCDIR)/helpcontent2/source/media))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,bg,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/bg/feldalle.png \
+    helpimg/bg/feldbrei.png \
+    helpimg/bg/feldcolo.png \
+    helpimg/bg/names_as_addressing.png \
+    helpimg/bg/sheettabs.png \
+    helpimg/bg/swh00117.png \
+    helpimg/bg/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,cs,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/cs/feldalle.png \
+    helpimg/cs/feldbrei.png \
+    helpimg/cs/feldcolo.png \
+    helpimg/cs/names_as_addressing.png \
+    helpimg/cs/sheettabs.png \
+    helpimg/cs/swh00117.png \
+    helpimg/cs/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,da,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/da/feldalle.png \
+    helpimg/da/feldbrei.png \
+    helpimg/da/feldcolo.png \
+    helpimg/da/names_as_addressing.png \
+    helpimg/da/sheettabs.png \
+    helpimg/da/swh00117.png \
+    helpimg/da/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,de,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/de/feldalle.png \
+    helpimg/de/feldcolo.png \
+    helpimg/de/names_as_addressing.png \
+    helpimg/de/sheettabs.png \
+    helpimg/de/swh00117.png \
+    helpimg/de/zellvor.png \
+))
+
+#TODO: Content for en-US is probably an error here; it should likely be part of the language-
+# independent helpcontent2/Package_html_media.mk instead:
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,en-US,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    screenshots/modules/swriter/ui/exportepub/en-US/EPubDialog.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,es,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/es/feldalle.png \
+    helpimg/es/feldcolo.png \
+    helpimg/es/names_as_addressing.png \
+    helpimg/es/sheettabs.png \
+    helpimg/es/swh00117.png \
+    helpimg/es/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,et,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/et/feldalle.png \
+    helpimg/et/feldbrei.png \
+    helpimg/et/feldcolo.png \
+    helpimg/et/names_as_addressing.png \
+    helpimg/et/sheettabs.png \
+    helpimg/et/swh00117.png \
+    helpimg/et/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,fr,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    files/scalc/fr/pivot.ods \
+    helpimg/fr/feldalle.png \
+    helpimg/fr/feldbrei.png \
+    helpimg/fr/feldcolo.png \
+    helpimg/fr/names_as_addressing.png \
+    helpimg/fr/sheettabs.png \
+    helpimg/fr/swh00117.png \
+    helpimg/fr/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,hu,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/hu/feldalle.png \
+    helpimg/hu/feldbrei.png \
+    helpimg/hu/feldcolo.png \
+    helpimg/hu/names_as_addressing.png \
+    helpimg/hu/sheettabs.png \
+    helpimg/hu/swh00117.png \
+    helpimg/hu/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,it,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/it/feldalle.png \
+    helpimg/it/feldbrei.png \
+    helpimg/it/feldcolo.png \
+    helpimg/it/names_as_addressing.png \
+    helpimg/it/sheettabs.png \
+    helpimg/it/swh00117.png \
+    helpimg/it/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,ja,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/ja/feldalle.png \
+    helpimg/ja/feldbrei.png \
+    helpimg/ja/feldcolo.png \
+    helpimg/ja/names_as_addressing.png \
+    helpimg/ja/sheettabs.png \
+    helpimg/ja/swh00055.png \
+    helpimg/ja/swh00117.png \
+    helpimg/ja/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,km,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/km/feldcolo.png \
+    helpimg/km/names_as_addressing.png \
+    helpimg/km/sheettabs.png \
+    helpimg/km/swh00117.png \
+    helpimg/km/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,ko,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/ko/feldalle.png \
+    helpimg/ko/feldbrei.png \
+    helpimg/ko/feldcolo.png \
+    helpimg/ko/names_as_addressing.png \
+    helpimg/ko/sheettabs.png \
+    helpimg/ko/swh00055.png \
+    helpimg/ko/swh00117.png \
+    helpimg/ko/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pl,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/pl/feldalle.png \
+    helpimg/pl/feldbrei.png \
+    helpimg/pl/feldcolo.png \
+    helpimg/pl/names_as_addressing.png \
+    helpimg/pl/sheettabs.png \
+    helpimg/pl/swh00117.png \
+    helpimg/pl/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pt,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/pt/feldalle.png \
+    helpimg/pt/feldbrei.png \
+    helpimg/pt/feldcolo.png \
+    helpimg/pt/names_as_addressing.png \
+    helpimg/pt/sheettabs.png \
+    helpimg/pt/swh00117.png \
+    helpimg/pt/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,pt-BR,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    files/scalc/pt-BR/pivot.ods \
+    helpimg/pt-BR/feldalle.png \
+    helpimg/pt-BR/feldbrei.png \
+    helpimg/pt-BR/feldcolo.png \
+    helpimg/pt-BR/names_as_addressing.png \
+    helpimg/pt-BR/sheettabs.png \
+    helpimg/pt-BR/swh00117.png \
+    helpimg/pt-BR/zellvor.png \
+    screenshots/modules/swriter/ui/exportepub/pt-BR/EPubDialog.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sk,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sk/feldalle.png \
+    helpimg/sk/feldbrei.png \
+    helpimg/sk/feldcolo.png \
+    helpimg/sk/names_as_addressing.png \
+    helpimg/sk/sheettabs.png \
+    helpimg/sk/swh00117.png \
+    helpimg/sk/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sl,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sl/feldalle.png \
+    helpimg/sl/feldbrei.png \
+    helpimg/sl/feldcolo.png \
+    helpimg/sl/names_as_addressing.png \
+    helpimg/sl/sheettabs.png \
+    helpimg/sl/swh00117.png \
+    helpimg/sl/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,sv,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/sv/feldalle.png \
+    helpimg/sv/feldbrei.png \
+    helpimg/sv/feldcolo.png \
+    helpimg/sv/names_as_addressing.png \
+    helpimg/sv/sheettabs.png \
+    helpimg/sv/swh00117.png \
+    helpimg/sv/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,tr,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/tr/feldalle.png \
+    helpimg/tr/feldbrei.png \
+    helpimg/tr/feldcolo.png \
+    helpimg/tr/names_as_addressing.png \
+    helpimg/tr/sheettabs.png \
+    helpimg/tr/swh00117.png \
+    helpimg/tr/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,zh-CN,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/zh-CN/feldalle.png \
+    helpimg/zh-CN/feldbrei.png \
+    helpimg/zh-CN/feldcolo.png \
+    helpimg/zh-CN/names_as_addressing.png \
+    helpimg/zh-CN/sheettabs.png \
+    helpimg/zh-CN/swh00055.png \
+    helpimg/zh-CN/swh00117.png \
+    helpimg/zh-CN/zellvor.png \
+))
+
+$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,zh-TW,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    helpimg/zh-TW/feldalle.png \
+    helpimg/zh-TW/feldbrei.png \
+    helpimg/zh-TW/feldcolo.png \
+    helpimg/zh-TW/names_as_addressing.png \
+    helpimg/zh-TW/sheettabs.png \
+    helpimg/zh-TW/swh00055.png \
+    helpimg/zh-TW/swh00117.png \
+    helpimg/zh-TW/zellvor.png \
+))
+
+#TODO: fy is filtered out for now, as $(SRCDIR)/helpcontent2/source/media/ doesn't contain the
+# corresponding screenshots yet:
+$(foreach lang,$(filter-out en-US fy,$(completelangiso)),$(eval $(call gb_AllLangPackage_add_files_for_lang,helpcontent2_html_media_lang,$(lang),$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    screenshots/modules/smath/ui/alignmentdialog/$(lang)/AlignmentDialog.png \
+    screenshots/modules/smath/ui/catalogdialog/$(lang)/CatalogDialog.png \
+    screenshots/modules/smath/ui/fontdialog/$(lang)/FontDialog.png \
+    screenshots/modules/smath/ui/fontsizedialog/$(lang)/FontSizeDialog.png \
+    screenshots/modules/smath/ui/fonttypedialog/$(lang)/FontsDialog.png \
+    screenshots/modules/smath/ui/savedefaultsdialog/$(lang)/SaveDefaultsDialog.png \
+    screenshots/modules/smath/ui/spacingdialog/$(lang)/SpacingDialog.png \
+    screenshots/modules/smath/ui/symdefinedialog/$(lang)/EditSymbols.png \
+)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index e4c1626e5d..1cd42d9a91 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -176,17 +176,19 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 # $(module)/$(lang).filelist files containing lists of files (in instdir) for the corresponding
 # module/lang parts of help data.  As a hack, generate those from the existing HelpTarget file
 # lists, which specify the original .xhp files (in SRCDIR for en-US, translated for all other
-# langs).  For the shared module, also include the per-lang non .xhp/.html files from AllLangPackage
-# helpcontent2_html_lang:
+# langs).  For the shared module, also include the per-lang non .xhp/.html files from the
+# AllLangPackages helpcontent2_html_lang and helpcontent2_html_media_lang:
 
 # html__filelist,lang,module
 define html__filelist
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/filelists/html-help/$(2)/$(1).filelist: \
         $(call gb_HelpTarget_get_filelist,$(2)/$(1)) \
-        $(if $(filter $(2),shared),$(call gb_Package_get_target,helpcontent2_html_lang_$(1)))
+        $(if $(filter $(2),shared), \
+            $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) \
+            $(call gb_Package_get_target,helpcontent2_html_media_lang_$(1)))
 	mkdir -p $$$$(dirname $$@)
 	sed -e 's|$(if $(filter $(1),en-US),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/|$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(1)/|g' -e 's|.xhp|.html|g' $(call gb_HelpTarget_get_filelist,$(2)/$(1)) > $$@
-	$(if $(filter $(2),shared),cat $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) >> $$@,:)
+	$(if $(filter $(2),shared),cat $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) $(call gb_Package_get_target,helpcontent2_html_media_lang_$(1)) >> $$@,:)
 
 endef
 
diff --git a/GeneratedPackage_html_icon-themes.mk b/GeneratedPackage_html_icon-themes.mk
new file mode 100644
index 0000000000..7d27e7a2c2
--- /dev/null
+++ b/GeneratedPackage_html_icon-themes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
+#
+# 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/.
+#
+
+# The help/media/icon-themes/ sub-tree.
+
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_icon-themes,$(SRCDIR)/icon-themes))
+
+$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_icon-themes,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,colibre))
+
+# vim: set noet sw=4 ts=4:
diff --git a/GeneratedPackage_html_media.mk b/GeneratedPackage_html_media.mk
deleted file mode 100644
index 423e6a2df9..0000000000
--- a/GeneratedPackage_html_media.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- 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_GeneratedPackage_GeneratedPackage,helpcontent2_html_media,$(SRCDIR)))
-
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,icon-themes/colibre))
-
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/helpimg,helpcontent2/source/media/helpimg))
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/navigation,helpcontent2/source/media/navigation))
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/screenshots,helpcontent2/source/media/screenshots))
-$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/files,helpcontent2/source/media/files))
-
-# vim: set noet sw=4 ts=4:
diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk
index 2f199d91d2..2163af8dab 100644
--- a/Module_helpcontent2.mk
+++ b/Module_helpcontent2.mk
@@ -18,11 +18,18 @@ ifeq ($(ENABLE_HTMLHELP),TRUE)
 $(eval $(call gb_Module_add_targets,helpcontent2,\
 	AllLangPackage_html_lang \
 	CustomTarget_html \
+	GeneratedPackage_html_icon-themes \
 	GeneratedPackage_html_lang_generated \
-	GeneratedPackage_html_media \
 	Package_html_dynamic \
+	Package_html_media \
 	Package_html_static \
 ))
+
+$(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
+	AllLangPackage_html_lang \
+	AllLangPackage_html_media_lang \
+))
+
 endif
 
 $(eval $(call gb_Module_add_l10n_targets,helpcontent2,\
diff --git a/Package_html_media.mk b/Package_html_media.mk
new file mode 100644
index 0000000000..203dcac271
--- /dev/null
+++ b/Package_html_media.mk
@@ -0,0 +1,332 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*-
+#
+# 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/.
+#
+
+# Language-independent parts of the help/media/ sub-tree.  All language-independent (or en-US
+# fallback) content from $(SRCDIR)/helpcontent2/source/media/ must be listed here.  An exception is
+# the help/media/icon-themes/ sub-tree, which is handled by
+# helpcontent2/GeneratedPackage_html_icon-themes.mk instead.
+
+$(eval $(call gb_Package_Package,helpcontent2_html_media,$(SRCDIR)/helpcontent2/source/media))
+
+$(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media, \
+    files/scalc/imtrigon.ods \
+    files/scalc/pivot.ods \
+    files/scalc/trigon.ods \
+    helpimg/area1.png \
+    helpimg/area2.png \
+    helpimg/border_ca_1.png \
+    helpimg/border_ca_2.png \
+    helpimg/border_ca_3.png \
+    helpimg/border_ca_4.png \
+    helpimg/border_ca_5.png \
+    helpimg/border_ca_6.png \
+    helpimg/border_ca_7.png \
+    helpimg/border_ca_8.png \
+    helpimg/border_ca_9.png \
+    helpimg/border_ca_gray.png \
+    helpimg/border_ca_white.png \
+    helpimg/border_wr_1.png \
+    helpimg/border_wr_2.png \
+    helpimg/border_wr_3.png \
+    helpimg/border_wr_4.png \
+    helpimg/border_wr_5.png \
+    helpimg/border_wr_6.png \
+    helpimg/border_wr_7.png \
+    helpimg/border_wr_8.png \
+    helpimg/border_wr_9.png \
+    helpimg/calcein.png \
+    helpimg/calcnav.png \
+    helpimg/copydata.png \
+    helpimg/diatrans.png \
+    helpimg/dircurscent.png \
+    helpimg/dircursleft.png \
+    helpimg/dircursright.png \
+    helpimg/ein.png \
+    helpimg/feldalle.png \
+    helpimg/feldbrei.png \
+    helpimg/feldcolo.png \
+    helpimg/feldurch.png \
+    helpimg/formschn.png \
+    helpimg/formsubt.png \
+    helpimg/formvers.png \
+    helpimg/hand01.png \
+    helpimg/hsizebar.png \
+    helpimg/impress_remote01.png \
+    helpimg/impress_remote02.png \
+    helpimg/impress_remote_icon.png \
+    helpimg/kombi1.png \
+    helpimg/left.png \
+    helpimg/left2.png \
+    helpimg/linkdata.png \
+    helpimg/linleft.png \
+    helpimg/linright.png \
+    helpimg/movedata.png \
+    helpimg/names_as_addressing.png \
+    helpimg/note.png \
+    helpimg/note_small.png \
+    helpimg/rechenlt.png \
+    helpimg/refhand.png \
+    helpimg/right.png \
+    helpimg/right2.png \
+    helpimg/rotieren.png \
+    helpimg/sc_PivotChartButtons.png \
+    helpimg/sc_data_form01.png \
+    helpimg/sc_func_imcot.png \
+    helpimg/sc_func_imcsc.png \
+    helpimg/sc_func_imcsch.png \
+    helpimg/sc_func_imsec.png \
+    helpimg/sc_func_imsech.png \
+    helpimg/sc_func_imtan.png \
+    helpimg/sd_PresenterConsole01.png \
+    helpimg/sd_PresenterConsole02.png \
+    helpimg/sd_PresenterConsole03.png \
+    helpimg/sd_PresenterConsole04.png \
+    helpimg/sheettabs.png \
+    helpimg/sistop.png \
+    helpimg/smzb1.png \
+    helpimg/smzb10.png \
+    helpimg/smzb2.png \
+    helpimg/smzb3.png \
+    helpimg/smzb4.png \
+    helpimg/smzb5.png \
+    helpimg/smzb6.png \
+    helpimg/smzb7.png \
+    helpimg/smzb8.png \
+    helpimg/smzb9.png \
+    helpimg/starmath/al21801.png \
+    helpimg/starmath/al21802.png \
+    helpimg/starmath/al21803.png \
+    helpimg/starmath/al21804.png \
+    helpimg/starmath/al21805.png \
+    helpimg/starmath/al21806.png \
+    helpimg/starmath/al21808.png \
+    helpimg/starmath/al21809.png \
+    helpimg/starmath/al21810.png \
+    helpimg/starmath/al21811.png \
+    helpimg/starmath/al21812.png \
+    helpimg/starmath/al21813.png \
+    helpimg/starmath/al21814.png \
+    helpimg/starmath/al21821.png \
+    helpimg/starmath/al21822.png \
+    helpimg/starmath/al21823.png \
+    helpimg/starmath/al21824.png \
+    helpimg/starmath/al21825.png \
+    helpimg/starmath/al21826.png \
+    helpimg/starmath/ar_right.png \
+    helpimg/starmath/at21701.png \
+    helpimg/starmath/at21702.png \
+    helpimg/starmath/at21703.png \
+    helpimg/starmath/at21704.png \
+    helpimg/starmath/at21705.png \
+    helpimg/starmath/at21706.png \
+    helpimg/starmath/at21707.png \
+    helpimg/starmath/at21708.png \
+    helpimg/starmath/at21709.png \
+    helpimg/starmath/at21710.png \
+    helpimg/starmath/at21711.png \
+    helpimg/starmath/at21712.png \
+    helpimg/starmath/at21713.png \
+    helpimg/starmath/at21714.png \
+    helpimg/starmath/at21715.png \
+    helpimg/starmath/at21716.png \
+    helpimg/starmath/at21717.png \
+    helpimg/starmath/at21718.png \
+    helpimg/starmath/at21719.png \
+    helpimg/starmath/at21720.png \
+    helpimg/starmath/at21722.png \
+    helpimg/starmath/at21723.png \
+    helpimg/starmath/at21724.png \
+    helpimg/starmath/bi21301.png \
+    helpimg/starmath/bi21302.png \
+    helpimg/starmath/bi21303.png \
+    helpimg/starmath/bi21304.png \
+    helpimg/starmath/bi21305.png \
+    helpimg/starmath/bi21306.png \
+    helpimg/starmath/bi21307.png \
+    helpimg/starmath/bi21308.png \
+    helpimg/starmath/bi21309.png \
+    helpimg/starmath/bi21310.png \
+    helpimg/starmath/bi21311.png \
+    helpimg/starmath/bi21312.png \
+    helpimg/starmath/bi21313.png \
+    helpimg/starmath/bi21314.png \
+    helpimg/starmath/bi21315.png \
+    helpimg/starmath/bi21316.png \
+    helpimg/starmath/bi21322.png \
+    helpimg/starmath/bi21323.png \
+    helpimg/starmath/bi21324.png \
+    helpimg/starmath/bi21325.png \
+    helpimg/starmath/bi21326.png \
+    helpimg/starmath/bi21327.png \
+    helpimg/starmath/bi21328.png \
+    helpimg/starmath/bi21329.png \
+    helpimg/starmath/bi21330.png \
+    helpimg/starmath/bi21331.png \
+    helpimg/starmath/bi21332.png \
+    helpimg/starmath/bi21333.png \
+    helpimg/starmath/bi21334.png \
+    helpimg/starmath/co21901.png \
+    helpimg/starmath/co21902.png \
+    helpimg/starmath/co21903.png \
+    helpimg/starmath/co21904.png \
+    helpimg/starmath/co21905.png \
+    helpimg/starmath/co21906.png \
+    helpimg/starmath/co21907.png \
+    helpimg/starmath/co21908.png \
+    helpimg/starmath/co21909.png \
+    helpimg/starmath/co21910.png \
+    helpimg/starmath/co21911.png \
+    helpimg/starmath/co21912.png \
+    helpimg/starmath/co21916.png \
+    helpimg/starmath/co21917.png \
+    helpimg/starmath/co21918.png \
+    helpimg/starmath/fo21601.png \
+    helpimg/starmath/fo21602.png \
+    helpimg/starmath/fo21603.png \
+    helpimg/starmath/fo21604.png \
+    helpimg/starmath/fo21605.png \
+    helpimg/starmath/fo21606.png \
+    helpimg/starmath/fo21607.png \
+    helpimg/starmath/fo21609.png \
+    helpimg/starmath/fo21610.png \
+    helpimg/starmath/fo21611.png \
+    helpimg/starmath/fo21613.png \
+    helpimg/starmath/fo21614.png \
+    helpimg/starmath/fo21615.png \
+    helpimg/starmath/fu21501.png \
+    helpimg/starmath/fu21502.png \
+    helpimg/starmath/fu21503.png \
+    helpimg/starmath/fu21504.png \
+    helpimg/starmath/fu21505.png \
+    helpimg/starmath/fu21506.png \
+    helpimg/starmath/fu21507.png \
+    helpimg/starmath/fu21508.png \
+    helpimg/starmath/fu21509.png \
+    helpimg/starmath/fu21510.png \
+    helpimg/starmath/fu21511.png \
+    helpimg/starmath/fu21512.png \
+    helpimg/starmath/fu21513.png \
+    helpimg/starmath/fu21514.png \
+    helpimg/starmath/fu21515.png \
+    helpimg/starmath/fu21516.png \
+    helpimg/starmath/fu21517.png \
+    helpimg/starmath/fu21518.png \
+    helpimg/starmath/fu21519.png \
+    helpimg/starmath/fu21520.png \
+    helpimg/starmath/fu21521.png \
+    helpimg/starmath/fu21522.png \
+    helpimg/starmath/fu21523.png \
+    helpimg/starmath/fu21524.png \
+    helpimg/starmath/fu21908.png \
+    helpimg/starmath/im21106.png \
+    helpimg/starmath/mi21608.png \
+    helpimg/starmath/mi21612.png \
+    helpimg/starmath/mi21618.png \
+    helpimg/starmath/mi22003.png \
+    helpimg/starmath/mi22004.png \
+    helpimg/starmath/mi22005.png \
+    helpimg/starmath/mi22006.png \
+    helpimg/starmath/mi22007.png \
+    helpimg/starmath/mi22008.png \
+    helpimg/starmath/mi22009.png \
+    helpimg/starmath/mi22010.png \
+    helpimg/starmath/mi22011.png \
+    helpimg/starmath/mi22012.png \
+    helpimg/starmath/mi22013.png \
+    helpimg/starmath/mi22014.png \
+    helpimg/starmath/mi22015.png \
+    helpimg/starmath/mi22016.png \
+    helpimg/starmath/mi22017.png \
+    helpimg/starmath/mi22018.png \
+    helpimg/starmath/mi22019.png \
+    helpimg/starmath/op21401.png \
+    helpimg/starmath/op21402.png \
+    helpimg/starmath/op21403.png \
+    helpimg/starmath/op21405.png \
+    helpimg/starmath/op21406.png \
+    helpimg/starmath/op21407.png \
+    helpimg/starmath/op21408.png \
+    helpimg/starmath/op21409.png \
+    helpimg/starmath/op21410.png \
+    helpimg/starmath/op21411.png \
+    helpimg/starmath/op21412.png \
+    helpimg/starmath/op21413.png \
+    helpimg/starmath/op21414.png \
+    helpimg/starmath/op21415.png \
+    helpimg/starmath/op21416.png \
+    helpimg/starmath/op21417.png \
+    helpimg/starmath/op21418.png \
+    helpimg/starmath/op21419.png \
+    helpimg/starmath/op21420.png \
+    helpimg/starmath/op21421.png \
+    helpimg/starmath/op22001.png \
+    helpimg/starmath/op22002.png \
+    helpimg/starmath/un21201.png \
+    helpimg/starmath/un21202.png \
+    helpimg/starmath/un21203.png \
+    helpimg/starmath/un21204.png \
+    helpimg/starmath/un21205.png \
+    helpimg/starmath/un21206.png \
+    helpimg/starmath/un21207.png \
+    helpimg/starmath/un21208.png \
+    helpimg/starmath/un21209.png \
+    helpimg/starmath/un21210.png \
+    helpimg/starmath/un21211.png \
+    helpimg/starmath/un21212.png \
+    helpimg/starmath/un21213.png \
+    helpimg/starmath/un21214.png \
+    helpimg/starmath/un21215.png \
+    helpimg/starmath/un21221.png \
+    helpimg/sw_paste_range.png \
+    helpimg/sw_signatureline01.png \
+    helpimg/sw_signatureline02.png \
+    helpimg/swh00055.png \
+    helpimg/swh00056.png \
+    helpimg/swh00117.png \
+    helpimg/swh00177.png \
+    helpimg/swh00178.png \
+    helpimg/swh00179.png \
+    helpimg/swh00180.png \
+    helpimg/tip.png \
+    helpimg/tip_small.png \
+    helpimg/ueberblenden.png \
+    helpimg/warning.png \
+    helpimg/warning_small.png \
+    helpimg/what-if.png \
+    helpimg/zellvor.png \
+    navigation/favicon.ico \
+    navigation/libo-base.svg \
+    navigation/libo-basic.svg \
+    navigation/libo-calc.svg \
+    navigation/libo-chart.svg \
+    navigation/libo-draw.svg \
+    navigation/libo-impress.svg \
+    navigation/libo-math.svg \
+    navigation/libo-symbol-white.svg \
+    navigation/libo-writer.svg \
+    screenshots/cui/ui/charnamepage/CharNamePage.png \
+    screenshots/cui/ui/colorpickerdialog/ColorPicker.png \
+    screenshots/cui/ui/optionsdialog/impressoptionsgeneraldialog.png \
+    screenshots/cui/ui/pageformatpage/PageFormatPage.png \
+    screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png \
+    screenshots/modules/scalc/ui/xmlsourcedialog/XMLSourceDialog.png \
+    screenshots/modules/sdraw/ui/dlgsnap/SnapObjectDialog.png \
+    screenshots/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog.png \
+    screenshots/modules/smath/ui/alignmentdialog/AlignmentDialog.png \
+    screenshots/modules/smath/ui/catalogdialog/CatalogDialog.png \
+    screenshots/modules/smath/ui/fontdialog/FontDialog.png \
+    screenshots/modules/smath/ui/fontsizedialog/FontSizeDialog.png \
+    screenshots/modules/smath/ui/fonttypedialog/FontsDialog.png \
+    screenshots/modules/smath/ui/savedefaultsdialog/SaveDefaultsDialog.png \
+    screenshots/modules/smath/ui/spacingdialog/SpacingDialog.png \
+    screenshots/modules/smath/ui/symdefinedialog/EditSymbols.png \
+    screenshots/modules/swriter/ui/watermarkdialog/WatermarkDialog.png \
+))
+
+# vim: set noet sw=4 ts=4: