diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-05-13 17:52:18 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-15 09:37:41 +0100 |
commit | 5d5950a766311cac4c851744c6622f8ac525975f (patch) | |
tree | c65cf8fcdebfca202108576f147753c2b117dd5f /extras | |
parent | gallery: use icerun for building, and tweak for windows use. (diff) | |
download | core-5d5950a766311cac4c851744c6622f8ac525975f.tar.gz core-5d5950a766311cac4c851744c6622f8ac525975f.zip |
gallery: convert text-shapes to new build logic.
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
Diffstat (limited to 'extras')
-rw-r--r-- | extras/Gallery_txtshapes.mk | 53 | ||||
-rw-r--r-- | extras/Module_extras.mk | 2 | ||||
-rw-r--r-- | extras/Package_galltxtshapes.mk | 55 | ||||
-rw-r--r-- | extras/source/gallery/share/gallery_names.ulf | 3 |
4 files changed, 57 insertions, 56 deletions
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk new file mode 100644 index 000000000000..85645a504955 --- /dev/null +++ b/extras/Gallery_txtshapes.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_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes)) + +$(eval $(call gb_Gallery_add_files,txtshapes,\ + extras/source/gallery/txtshapes/Circle01-DarkBlue.png \ + extras/source/gallery/txtshapes/Circle02-LightBlue.png \ + extras/source/gallery/txtshapes/Circle03-Green.png \ + extras/source/gallery/txtshapes/Circle04-DarkRed.png \ + extras/source/gallery/txtshapes/Circle05-Orange.png \ + extras/source/gallery/txtshapes/Hexagon01-DarkBlue.png \ + extras/source/gallery/txtshapes/Hexagon02-Blue.png \ + extras/source/gallery/txtshapes/Hexagon03-Green.png \ + extras/source/gallery/txtshapes/Hexagon04-DarkRed.png \ + extras/source/gallery/txtshapes/Hexagon05-Orange.png \ + extras/source/gallery/txtshapes/Leaf01-DarkBlue.png \ + extras/source/gallery/txtshapes/Leaf02-LightBlue.png \ + extras/source/gallery/txtshapes/Leaf03-Green.png \ + extras/source/gallery/txtshapes/Leaf04-DarkRed.png \ + extras/source/gallery/txtshapes/Leaf05-Orange.png \ + extras/source/gallery/txtshapes/Paster01-DarkBlue.png \ + extras/source/gallery/txtshapes/Paster02-LightBlue.png \ + extras/source/gallery/txtshapes/Paster03-Green.png \ + extras/source/gallery/txtshapes/Paster04-Red.png \ + extras/source/gallery/txtshapes/Paster05-Orange.png \ + extras/source/gallery/txtshapes/Rectangle01-DarkBlue.png \ + extras/source/gallery/txtshapes/Rectangle02-LightBlue.png \ + extras/source/gallery/txtshapes/Rectangle03-Green.png \ + extras/source/gallery/txtshapes/Rectangle04-DarkRed.png \ + extras/source/gallery/txtshapes/Rectangle05-Orange.png \ + extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png \ + extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png \ + extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png \ + extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png \ + extras/source/gallery/txtshapes/Square01-DarkBlue.png \ + extras/source/gallery/txtshapes/Square02-LightBlue.png \ + extras/source/gallery/txtshapes/Square03-Green.png \ + extras/source/gallery/txtshapes/Square04-DarkRed.png \ + extras/source/gallery/txtshapes/Square05-Orange.png \ + extras/source/gallery/txtshapes/Square06-Striped-Blue.png \ + extras/source/gallery/txtshapes/Square07-Striped-Green.png \ + extras/source/gallery/txtshapes/Square08-Striped-Red.png \ + extras/source/gallery/txtshapes/Square09-Striped-Orange.png \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 82fc5ea73f09..f83018673d26 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_gallsymbols \ Package_gallsystem \ Package_galltransport \ - Package_galltxtshapes \ Package_gallwwwback \ Package_gallwwwgraf \ Package_glade \ @@ -57,6 +56,7 @@ $(eval $(call gb_Module_add_targets,extras,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extras,\ Gallery_sound \ + Gallery_txtshapes \ )) endif diff --git a/extras/Package_galltxtshapes.mk b/extras/Package_galltxtshapes.mk deleted file mode 100644 index 7040c7c0462f..000000000000 --- a/extras/Package_galltxtshapes.mk +++ /dev/null @@ -1,55 +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,extras_galltxtshapes,$(SRCDIR)/extras/source/gallery/txtshapes)) - -$(eval $(call gb_Package_set_outdir,extras_galltxtshapes,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,extras_galltxtshapes,share/gallery/textshapes,\ - Circle01-DarkBlue.png \ - Circle02-LightBlue.png \ - Circle03-Green.png \ - Circle04-DarkRed.png \ - Circle05-Orange.png \ - Hexagon01-DarkBlue.png \ - Hexagon02-Blue.png \ - Hexagon03-Green.png \ - Hexagon04-DarkRed.png \ - Hexagon05-Orange.png \ - Leaf01-DarkBlue.png \ - Leaf02-LightBlue.png \ - Leaf03-Green.png \ - Leaf04-DarkRed.png \ - Leaf05-Orange.png \ - Paster01-DarkBlue.png \ - Paster02-LightBlue.png \ - Paster03-Green.png \ - Paster04-Red.png \ - Paster05-Orange.png \ - Rectangle01-DarkBlue.png \ - Rectangle02-LightBlue.png \ - Rectangle03-Green.png \ - Rectangle04-DarkRed.png \ - Rectangle05-Orange.png \ - Rectangle06-Striped-Blue.png \ - Rectangle07-Striped-Green.png \ - Rectangle08-Striped-Red.png \ - Rectangle09-Striped-Orange.png \ - Square01-DarkBlue.png \ - Square02-LightBlue.png \ - Square03-Green.png \ - Square04-DarkRed.png \ - Square05-Orange.png \ - Square06-Striped-Blue.png \ - Square07-Striped-Green.png \ - Square08-Striped-Red.png \ - Square09-Striped-Orange.png \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf index 47f75b562135..35e3c49fb2a5 100644 --- a/extras/source/gallery/share/gallery_names.ulf +++ b/extras/source/gallery/share/gallery_names.ulf @@ -9,4 +9,7 @@ [sound] en-US = "Sounds" +[txtshapes] +en-US = "Text Shapes" + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |