diff options
| -rw-r--r-- | GeneratedPackage_html_lang_generated.mk (renamed from GeneratedPackage_html_generated.mk) | 6 | ||||
| -rw-r--r-- | Module_helpcontent2.mk | 5 | ||||
| -rw-r--r-- | Package_html.mk | 25 | ||||
| -rw-r--r-- | Package_html_dynamic.mk | 18 | ||||
| -rw-r--r-- | Package_html_lang.mk | 21 |
5 files changed, 45 insertions, 30 deletions
diff --git a/GeneratedPackage_html_generated.mk b/GeneratedPackage_html_lang_generated.mk index 04e59c2856..63b5cef82b 100644 --- a/GeneratedPackage_html_generated.mk +++ b/GeneratedPackage_html_lang_generated.mk @@ -7,12 +7,12 @@ # # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # # -$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_generated,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) +$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_lang_generated,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) -$(eval $(call gb_GeneratedPackage_use_customtarget,helpcontent2_html_generated,helpcontent2/help3xsl)) +$(eval $(call gb_GeneratedPackage_use_customtarget,helpcontent2_html_lang_generated,helpcontent2/help3xsl)) $(eval $(foreach lang,$(gb_HELP_LANGS),\ -$(call gb_GeneratedPackage_add_dir,helpcontent2_html_generated,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/$(lang)/text,$(lang)/text) \ +$(call gb_GeneratedPackage_add_dir,helpcontent2_html_lang_generated,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/$(lang)/text,$(lang)/text) \ )) # vim: set noet sw=4 ts=4: diff --git a/Module_helpcontent2.mk b/Module_helpcontent2.mk index 3e69742f96..2975af0adb 100644 --- a/Module_helpcontent2.mk +++ b/Module_helpcontent2.mk @@ -17,10 +17,11 @@ $(eval $(call gb_Module_add_targets,helpcontent2,\ ifeq ($(ENABLE_HTMLHELP),TRUE) $(eval $(call gb_Module_add_targets,helpcontent2,\ CustomTarget_html \ + GeneratedPackage_html_lang_generated \ GeneratedPackage_html_media \ - GeneratedPackage_html_generated \ + Package_html_dynamic \ + Package_html_lang \ Package_html_static \ - Package_html \ )) endif diff --git a/Package_html.mk b/Package_html.mk deleted file mode 100644 index 32e649d8c3..0000000000 --- a/Package_html.mk +++ /dev/null @@ -1,25 +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_Package_Package,helpcontent2_html,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) - -$(eval $(call gb_Package_use_customtarget,helpcontent2_html,helpcontent2/help3xsl)) - -$(eval $(call gb_Package_add_files,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION)),\ - hid2file.js \ -)) - -$(eval $(call gb_Package_add_files_with_dir,helpcontent2_html,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION)),\ - $(foreach lang,$(gb_HELP_LANGS),\ - $(lang)/bookmarks.js \ - $(lang)/contents.js \ - ) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk new file mode 100644 index 0000000000..6b42f56bee --- /dev/null +++ b/Package_html_dynamic.mk @@ -0,0 +1,18 @@ +# -*- 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/. +# + +$(eval $(call gb_Package_Package,helpcontent2_html_dynamic,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) + +$(eval $(call gb_Package_use_customtarget,helpcontent2_html_dynamic,helpcontent2/help3xsl)) + +$(eval $(call gb_Package_add_files,helpcontent2_html_dynamic,$(LIBO_SHARE_HELP_FOLDER)/$(if $(HELP_ONLINE),/$(PRODUCTVERSION)), \ + hid2file.js \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/Package_html_lang.mk b/Package_html_lang.mk new file mode 100644 index 0000000000..7368403e80 --- /dev/null +++ b/Package_html_lang.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,helpcontent2_html_lang,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) + +$(eval $(call gb_Package_use_customtarget,helpcontent2_html_lang,helpcontent2/help3xsl)) + +$(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_lang,$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION)),\ + $(foreach lang,$(gb_HELP_LANGS),\ + $(lang)/bookmarks.js \ + $(lang)/contents.js \ + ) \ +)) + +# vim: set noet sw=4 ts=4: |