diff options
| -rw-r--r-- | extras/ExternalPackage_accessoriesgallerydrawspeople.mk | 38 | ||||
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Zip_accessoriesgallerydrawspeople.mk | 39 | ||||
| -rw-r--r-- | scp2/source/accessories/file_gallery_accessories.scp | 7 |
4 files changed, 43 insertions, 43 deletions
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk new file mode 100644 index 000000000000..df6ffbebf119 --- /dev/null +++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk @@ -0,0 +1,38 @@ +# -*- 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,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People)) +$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack)) + +$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTDIR))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,share/gallery/Draws/People,\ + accessories/Draws/People/Baboo1.png \ + accessories/Draws/People/Jac1.png \ + accessories/Draws/People/Jac2.png \ + accessories/Draws/People/Jac3.png \ + accessories/Draws/People/Jac4.png \ + accessories/Draws/People/Paul-1.png \ + accessories/Draws/People/Paul-2.png \ + accessories/Draws/People/Paul-3.jpg \ + accessories/Draws/People/Paul-3.png \ + accessories/Draws/People/Paul-4.png \ + accessories/Draws/People/Paul-5.png \ + accessories/Draws/People/Paul-6.png \ + accessories/Draws/People/Paul-7.png \ + accessories/Draws/People/Paul-8.png \ + accessories/Draws/People/Ruty1.png \ + accessories/Draws/People/tof-1.png \ + accessories/Draws/People/tof-2.png \ + accessories/Draws/People/tof-3.png \ + accessories/Draws/People/Zoa1.png \ + accessories/Draws/People/Zoa2.jpg \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 7b494e4d827a..08351c129479 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -61,7 +61,7 @@ ifeq ($(WITH_EXTRA_GALLERY),YES) $(eval $(call gb_Module_add_targets,extras,\ UnpackedTarball_gallery_pack \ ExternalPackage_accessoriesgallery \ - Zip_accessoriesgallerydrawspeople \ + ExternalPackage_accessoriesgallerydrawspeople \ Zip_accessoriesgalleryelementsbullets2 \ Zip_accessoriesgallerynonfree \ Zip_accessoriesgalleryphotosbuildings \ diff --git a/extras/Zip_accessoriesgallerydrawspeople.mk b/extras/Zip_accessoriesgallerydrawspeople.mk deleted file mode 100644 index 064ce84aee54..000000000000 --- a/extras/Zip_accessoriesgallerydrawspeople.mk +++ /dev/null @@ -1,39 +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_Zip_Zip,accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People)) - -$(eval $(call gb_Zip_add_dependencies,accessoriesgallerydrawspeople,\ - $(call gb_UnpackedTarball_get_target,gallery-pack) \ -)) - -$(eval $(call gb_Zip_add_files,accessoriesgallerydrawspeople,\ - Baboo1.png \ - Jac1.png \ - Jac2.png \ - Jac3.png \ - Jac4.png \ - Paul-1.png \ - Paul-2.png \ - Paul-3.jpg \ - Paul-3.png \ - Paul-4.png \ - Paul-5.png \ - Paul-6.png \ - Paul-7.png \ - Paul-8.png \ - Ruty1.png \ - tof-1.png \ - tof-2.png \ - tof-3.png \ - Zoa1.png \ - Zoa2.jpg \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp index 11ce2ed2e295..57ec168eabb0 100644 --- a/scp2/source/accessories/file_gallery_accessories.scp +++ b/scp2/source/accessories/file_gallery_accessories.scp @@ -42,9 +42,10 @@ File gid_File_Extra_Gallery_Accessories End File gid_File_Extra_Gallery_Draws_People_Accessories - Dir = gid_Dir_Gallery_Draws_People; - ARCHIVE_TXT_FILE_BODY; - Name = "accessoriesgallerydrawspeople.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_accessoriesgallerydrawspeople.filelist"; End File gid_File_Extra_Gallery_Photos_Plants_Accessories |