fdo#70393: move external accessories to a subdir of external

Change-Id: If69c8e10eb3ce19208390f63aef49cf1d9554ef1
Reviewed-on: https://gerrit.libreoffice.org/6572Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

external/Module_external.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+	accessories \
 	libxmlsec \
 	np_sdk \
 	$(call gb_Helper_optional,AFMS,afms) \

extras/ExternalPackage_accessoriesgallery.mk → external/accessories/ExternalPackage_accessoriesgallery.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallery,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories/sg1010.sdg \
 	accessories/sg1010.sdv \
 	accessories/sg1010.thm \

extras/ExternalPackage_accessoriesgallerydrawspeople.mk → external/accessories/ExternalPackage_accessoriesgallerydrawspeople.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-#$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
+#$(eval $(call gb_Package_Package,accessories_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallerydrawspeople,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
 	accessories/Draws/People/Baboo1.png \
 	accessories/Draws/People/Jac1.png \
 	accessories/Draws/People/Jac2.png \

extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk → external/accessories/ExternalPackage_accessoriesgalleryelementsbullets2.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryelementsbullets2,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
 	accessories/Elements/Bullets2/amethyst.arrow.png \
 	accessories/Elements/Bullets2/amethyst.asterisk.png \
 	accessories/Elements/Bullets2/amethyst.circle-light.png \

extras/ExternalPackage_accessoriesgallerynonfree.mk → external/accessories/ExternalPackage_accessoriesgallerynonfree.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgallerynonfree,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories-nonfree/sg600.sdg \
 	accessories-nonfree/sg600.sdv \
 	accessories-nonfree/sg600.thm \

extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosbuildings.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosbuildings,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
 	accessories/Photos/Buildings/ArkSoft0408010009.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010023.jpg \
 	accessories/Photos/Buildings/ArkSoft0408010026.jpg \

extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk → external/accessories/ExternalPackage_accessoriesgalleryphotoscelebration.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoscelebration,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
 	accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
 	accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
 ))

extras/ExternalPackage_accessoriesgalleryphotoscities.mk → external/accessories/ExternalPackage_accessoriesgalleryphotoscities.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoscities,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
 	accessories/Photos/Cities/ArkSoft0507170040.jpg \
 	accessories/Photos/Cities/ArkSoft0507170041.jpg \
 	accessories/Photos/Cities/ArkSoft0508100003.jpg \

extras/ExternalPackage_accessoriesgalleryphotosfauna.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosfauna.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosfauna,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
 	accessories/Photos/Fauna/ArkSoft0407030001.jpg \
 	accessories/Photos/Fauna/bee_on_citrus.jpg \
 	accessories/Photos/Fauna/dog01.jpg \

extras/ExternalPackage_accessoriesgalleryphotosflowers.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosflowers.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosflowers,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
 	accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
 	accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
 	accessories/Photos/Flowers/ArkSoft0405010001.jpg \

extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_lasagna.jpg \

extras/ExternalPackage_accessoriesgalleryphotoshumans.mk → external/accessories/ExternalPackage_accessoriesgalleryphotoshumans.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoshumans,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
 	accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
 	accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
 	accessories/Photos/Humans/1473308070_30ac88194b_o.jpg \

extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk → external/accessories/ExternalPackage_accessoriesgalleryphotoslandscapes.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotoslandscapes,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
 	accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
 	accessories/Photos/Landscapes/ArkSoft0405010050.jpg \

extras/ExternalPackage_accessoriesgalleryphotosobjects.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosobjects.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosobjects,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
 	accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
 	accessories/Photos/Objects/morguefiles_com_pindiyath100_122931551.jpg \

extras/ExternalPackage_accessoriesgalleryphotosplants.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosplants.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosplants,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
 	accessories/Photos/Plants/ArkSoft0405020018.jpg \
 	accessories/Photos/Plants/ArkSoft0405020019.jpg \
 	accessories/Photos/Plants/ArkSoft0508100018.jpg \

extras/ExternalPackage_accessoriesgalleryphotosspace.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosspace.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosspace,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
 	accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
 	accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
 	accessories/Photos/Space/Wikimedia_Space_2005-06-b-large_web.jpg \

extras/ExternalPackage_accessoriesgalleryphotosstatues.mk → external/accessories/ExternalPackage_accessoriesgalleryphotosstatues.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotosstatues,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
 	accessories/Photos/Statues/ArkSoft0507170027.jpg \
 	accessories/Photos/Statues/ArkSoft0507170032.jpg \
 	accessories/Photos/Statues/ArkSoft0507170033.jpg \

extras/ExternalPackage_accessoriesgalleryphotostravel.mk → external/accessories/ExternalPackage_accessoriesgalleryphotostravel.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriesgalleryphotostravel,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
 	accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
 	accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
 	accessories/Photos/Travel/JS_PDPhO_tall_ship.jpg \

extras/ExternalPackage_accessoriestemplatescommon.mk → external/accessories/ExternalPackage_accessoriestemplatescommon.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommon,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
 	templates/common/dummy_common_templates.txt \
 	templates/common/svn-commit.2.tmp \
 	templates/common/svn-commit.tmp \

extras/ExternalPackage_accessoriestemplatescommoneducate.mk → external/accessories/ExternalPackage_accessoriestemplatescommoneducate.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommoneducate,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
 	templates/common/educate/A4-chequered.otg \
 	templates/common/educate/A4-lin_2mm.otg \
 	templates/common/educate/A4-lin_3mm.otg \

extras/ExternalPackage_accessoriestemplatescommonfinance.mk → external/accessories/ExternalPackage_accessoriestemplatescommonfinance.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonfinance,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
 	templates/common/finance/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonforms.mk → external/accessories/ExternalPackage_accessoriestemplatescommonforms.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonforms,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
 	templates/common/forms/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonlabels.mk → external/accessories/ExternalPackage_accessoriestemplatescommonlabels.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonlabels,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
 	templates/common/labels/24_port_patch_text.otg \
 	templates/common/labels/arrows-black-base.ott \
 	templates/common/labels/WL-OL1000.ott \

extras/ExternalPackage_accessoriestemplatescommonlayout.mk → external/accessories/ExternalPackage_accessoriestemplatescommonlayout.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonlayout,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
 	templates/common/layout/31407-squares.otp \
 	templates/common/layout/abstract-015_1.jpg.otp \
 	templates/common/layout/abstract-015_2.jpg.otp \

extras/ExternalPackage_accessoriestemplatescommonmisc.mk → external/accessories/ExternalPackage_accessoriestemplatescommonmisc.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonmisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
 	templates/common/misc/White_Notebook_Paper_legal.ott \
 	templates/common/misc/Yellow_Pad_Legal.ott \
 ))

extras/ExternalPackage_accessoriestemplatescommonofficorr.mk → external/accessories/ExternalPackage_accessoriestemplatescommonofficorr.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonofficorr,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
 	templates/common/officorr/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk → external/accessories/ExternalPackage_accessoriestemplatescommonoffimisc.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonoffimisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
 	templates/common/offimisc/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonpersonal.mk → external/accessories/ExternalPackage_accessoriestemplatescommonpersonal.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonpersonal,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
 	templates/common/personal/szivesoldal.otg \
 ))
 

extras/ExternalPackage_accessoriestemplatescommonpresent.mk → external/accessories/ExternalPackage_accessoriestemplatescommonpresent.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_accessoriestemplatescommonpresent,templates-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
 	templates/common/presnt/dummy_common_templates.txt \
 ))
 

extras/ExternalPackage_extra_fonts.mk → external/accessories/ExternalPackage_extra_fonts.mk

@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessories_extra_fonts,fonts-pack))
 
-$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
+$(eval $(call gb_ExternalPackage_use_unpacked,accessories_extra_fonts,fonts-pack))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessories_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	decorative/BETSY2.ttf \
 	decorative/Berylibi.ttf \
 	decorative/Beryliub.ttf \

external/accessories/Makefile

+# -*- 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:

external/accessories/Module_accessories.mk

+# -*- 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,accessories))
+
+ifeq ($(WITH_EXTRA_FONT),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	ExternalPackage_extra_fonts \
+	UnpackedTarball_fonts_pack \
+))
+endif
+
+ifeq ($(WITH_EXTRA_GALLERY),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	UnpackedTarball_gallery_pack \
+	ExternalPackage_accessoriesgallery \
+	ExternalPackage_accessoriesgallerydrawspeople \
+	ExternalPackage_accessoriesgalleryelementsbullets2 \
+	ExternalPackage_accessoriesgallerynonfree \
+	ExternalPackage_accessoriesgalleryphotosbuildings \
+	ExternalPackage_accessoriesgalleryphotoscelebration \
+	ExternalPackage_accessoriesgalleryphotoscities \
+	ExternalPackage_accessoriesgalleryphotosfauna \
+	ExternalPackage_accessoriesgalleryphotosflowers \
+	ExternalPackage_accessoriesgalleryphotosfoodsanddrinks \
+	ExternalPackage_accessoriesgalleryphotoshumans \
+	ExternalPackage_accessoriesgalleryphotoslandscapes \
+	ExternalPackage_accessoriesgalleryphotosobjects \
+	ExternalPackage_accessoriesgalleryphotosplants \
+	ExternalPackage_accessoriesgalleryphotosspace \
+	ExternalPackage_accessoriesgalleryphotosstatues \
+	ExternalPackage_accessoriesgalleryphotostravel \
+))
+endif
+
+ifeq ($(WITH_EXTRA_SAMPLE),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	AllLangPackage_accessoriessamples \
+	AllLangPackage_accessoriessamplesadvertisement \
+	AllLangPackage_accessoriessamplesdocumentation \
+	AllLangPackage_accessoriessamplesnonfree \
+	AllLangPackage_accessoriessamplesnonfreeadvertisement \
+	AllLangPackage_accessoriessamplesnonfreedocumentation \
+	UnpackedTarball_samples_pack \
+))
+endif
+
+ifeq ($(WITH_EXTRA_TEMPLATE),YES)
+$(eval $(call gb_Module_add_targets,accessories,\
+	AllLangPackage_accessoriestemplates \
+	AllLangPackage_accessoriestemplateseducate \
+	AllLangPackage_accessoriestemplatesfinance \
+	AllLangPackage_accessoriestemplatesforms \
+	AllLangPackage_accessoriestemplateslabels \
+	AllLangPackage_accessoriestemplateslayout \
+	AllLangPackage_accessoriestemplatesmisc \
+	AllLangPackage_accessoriestemplatesnonfree \
+	AllLangPackage_accessoriestemplatesnonfreeeducate \
+	AllLangPackage_accessoriestemplatesnonfreefinance \
+	AllLangPackage_accessoriestemplatesnonfreeforms \
+	AllLangPackage_accessoriestemplatesnonfreelabels \
+	AllLangPackage_accessoriestemplatesnonfreelayout \
+	AllLangPackage_accessoriestemplatesnonfreemisc \
+	AllLangPackage_accessoriestemplatesnonfreeofficorr \
+	AllLangPackage_accessoriestemplatesnonfreeoffimisc \
+	AllLangPackage_accessoriestemplatesnonfreepersonal \
+	AllLangPackage_accessoriestemplatesnonfreepresent \
+	AllLangPackage_accessoriestemplatesofficorr \
+	AllLangPackage_accessoriestemplatesoffimisc \
+	AllLangPackage_accessoriestemplatespersonal \
+	AllLangPackage_accessoriestemplatespresent \
+	ExternalPackage_accessoriestemplatescommon \
+	ExternalPackage_accessoriestemplatescommoneducate \
+	ExternalPackage_accessoriestemplatescommonfinance \
+	ExternalPackage_accessoriestemplatescommonforms \
+	ExternalPackage_accessoriestemplatescommonlabels \
+	ExternalPackage_accessoriestemplatescommonlayout \
+	ExternalPackage_accessoriestemplatescommonmisc \
+	ExternalPackage_accessoriestemplatescommonofficorr \
+	ExternalPackage_accessoriestemplatescommonoffimisc \
+	ExternalPackage_accessoriestemplatescommonpersonal \
+	ExternalPackage_accessoriestemplatescommonpresent \
+	UnpackedTarball_templates_pack \
+))
+endif
+
+# vim: set noet sw=4 ts=4:

extras/Module_extras.mk

@@ -59,85 +59,4 @@ $(eval $(call gb_Module_add_targets,extras,\
 ))
 endif
 
-ifeq ($(WITH_EXTRA_FONT),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	ExternalPackage_extra_fonts \
-	UnpackedTarball_fonts_pack \
-))
-endif
-
-ifeq ($(WITH_EXTRA_GALLERY),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	UnpackedTarball_gallery_pack \
-	ExternalPackage_accessoriesgallery \
-	ExternalPackage_accessoriesgallerydrawspeople \
-	ExternalPackage_accessoriesgalleryelementsbullets2 \
-	ExternalPackage_accessoriesgallerynonfree \
-	ExternalPackage_accessoriesgalleryphotosbuildings \
-	ExternalPackage_accessoriesgalleryphotoscelebration \
-	ExternalPackage_accessoriesgalleryphotoscities \
-	ExternalPackage_accessoriesgalleryphotosfauna \
-	ExternalPackage_accessoriesgalleryphotosflowers \
-	ExternalPackage_accessoriesgalleryphotosfoodsanddrinks \
-	ExternalPackage_accessoriesgalleryphotoshumans \
-	ExternalPackage_accessoriesgalleryphotoslandscapes \
-	ExternalPackage_accessoriesgalleryphotosobjects \
-	ExternalPackage_accessoriesgalleryphotosplants \
-	ExternalPackage_accessoriesgalleryphotosspace \
-	ExternalPackage_accessoriesgalleryphotosstatues \
-	ExternalPackage_accessoriesgalleryphotostravel \
-))
-endif
-
-ifeq ($(WITH_EXTRA_SAMPLE),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	AllLangPackage_accessoriessamples \
-	AllLangPackage_accessoriessamplesadvertisement \
-	AllLangPackage_accessoriessamplesdocumentation \
-	AllLangPackage_accessoriessamplesnonfree \
-	AllLangPackage_accessoriessamplesnonfreeadvertisement \
-	AllLangPackage_accessoriessamplesnonfreedocumentation \
-	UnpackedTarball_samples_pack \
-))
-endif
-
-ifeq ($(WITH_EXTRA_TEMPLATE),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	AllLangPackage_accessoriestemplates \
-	AllLangPackage_accessoriestemplateseducate \
-	AllLangPackage_accessoriestemplatesfinance \
-	AllLangPackage_accessoriestemplatesforms \
-	AllLangPackage_accessoriestemplateslabels \
-	AllLangPackage_accessoriestemplateslayout \
-	AllLangPackage_accessoriestemplatesmisc \
-	AllLangPackage_accessoriestemplatesnonfree \
-	AllLangPackage_accessoriestemplatesnonfreeeducate \
-	AllLangPackage_accessoriestemplatesnonfreefinance \
-	AllLangPackage_accessoriestemplatesnonfreeforms \
-	AllLangPackage_accessoriestemplatesnonfreelabels \
-	AllLangPackage_accessoriestemplatesnonfreelayout \
-	AllLangPackage_accessoriestemplatesnonfreemisc \
-	AllLangPackage_accessoriestemplatesnonfreeofficorr \
-	AllLangPackage_accessoriestemplatesnonfreeoffimisc \
-	AllLangPackage_accessoriestemplatesnonfreepersonal \
-	AllLangPackage_accessoriestemplatesnonfreepresent \
-	AllLangPackage_accessoriestemplatesofficorr \
-	AllLangPackage_accessoriestemplatesoffimisc \
-	AllLangPackage_accessoriestemplatespersonal \
-	AllLangPackage_accessoriestemplatespresent \
-	ExternalPackage_accessoriestemplatescommon \
-	ExternalPackage_accessoriestemplatescommoneducate \
-	ExternalPackage_accessoriestemplatescommonfinance \
-	ExternalPackage_accessoriestemplatescommonforms \
-	ExternalPackage_accessoriestemplatescommonlabels \
-	ExternalPackage_accessoriestemplatescommonlayout \
-	ExternalPackage_accessoriestemplatescommonmisc \
-	ExternalPackage_accessoriestemplatescommonofficorr \
-	ExternalPackage_accessoriestemplatescommonoffimisc \
-	ExternalPackage_accessoriestemplatescommonpersonal \
-	ExternalPackage_accessoriestemplatescommonpresent \
-	UnpackedTarball_templates_pack \
-))
-endif
-
 # vim: set noet sw=4 ts=4: