From 9148ad0206a407abbbed658da75d5de98ae2945a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 30 Oct 2012 13:28:58 +0100 Subject: extras: extra_fonts needs to be a ExternalPackage ... so everything is re-delivered on an incremental build when unpack happens. Change-Id: I0d6dae6bdbafc94898546146140069d4c67f5c8e --- extras/ExternalPackage_extra_fonts.mk | 187 ++++++++++++++++++++++++++++++++++ extras/Module_extras.mk | 2 +- extras/Package_extra_fonts.mk | 187 ---------------------------------- 3 files changed, 188 insertions(+), 188 deletions(-) create mode 100644 extras/ExternalPackage_extra_fonts.mk delete mode 100644 extras/Package_extra_fonts.mk (limited to 'extras') diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk new file mode 100644 index 000000000000..638af351680f --- /dev/null +++ b/extras/ExternalPackage_extra_fonts.mk @@ -0,0 +1,187 @@ +# -*- 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_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack)) + +$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,pck,\ + decorative/BETSY2.ttf \ + decorative/Berylibi.ttf \ + decorative/Beryliub.ttf \ + decorative/Beryliui.ttf \ + decorative/Berylium.ttf \ + decorative/CHOPS___.TTF \ + decorative/DTPDingbats.ttf \ + decorative/GenAI102.TTF \ + decorative/GenAR102.TTF \ + decorative/GenI102.TTF \ + decorative/GenR102.TTF \ + decorative/Justus-Bold.ttf \ + decorative/Justus-Italic.ttf \ + decorative/Justus-ItalicOldstyle.ttf \ + decorative/Justus-Oldstyle.ttf \ + decorative/Justus-Roman.ttf \ + decorative/Justus-Versalitas.ttf \ + decorative/MgOpenCanonicaBold.ttf \ + decorative/MgOpenCanonicaBoldItalic.ttf \ + decorative/MgOpenCanonicaItalic.ttf \ + decorative/MgOpenCanonicaRegular.ttf \ + decorative/NEUROPOL.ttf \ + decorative/SAPPM___.ttf \ + decorative/Tuffy.ttf \ + decorative/Tuffy_Bold.ttf \ + decorative/Tuffy_Bold_Italic.ttf \ + decorative/Tuffy_Italic.ttf \ + decorative/Verina_Sans_Bold.otf \ + decorative/Verina_Sans_Bold_Oblique.otf \ + decorative/Verina_Sans_Mono.otf \ + decorative/Verina_Sans_Mono_Bold.otf \ + decorative/Verina_Sans_Mono_Bold_Oblique.otf \ + decorative/Verina_Sans_Mono_Oblique.otf \ + decorative/Verina_Sans_Oblique.otf \ + decorative/Verina_Sans_Roman.otf \ + decorative/Verina_Serif.otf \ + decorative/Verina_Serif_Bold.otf \ + decorative/a010013l.ttf \ + decorative/a010015l.ttf \ + decorative/a010033l.ttf \ + decorative/a010035l.ttf \ + decorative/airmole.ttf \ + decorative/airmolea.ttf \ + decorative/airmoleq.ttf \ + decorative/airmoles.ttf \ + decorative/astronbi.ttf \ + decorative/astronbo.ttf \ + decorative/astronbv.ttf \ + decorative/astronbw.ttf \ + decorative/b018012l.ttf \ + decorative/b018015l.ttf \ + decorative/b018032l.ttf \ + decorative/b018035l.ttf \ + decorative/baveuse.ttf \ + decorative/bluebold.ttf \ + decorative/bluecond.ttf \ + decorative/bluehigh.ttf \ + decorative/bluehigl.ttf \ + decorative/bullpen3.ttf \ + decorative/bullpen_.ttf \ + decorative/bullpeni.ttf \ + decorative/c059013l.ttf \ + decorative/c059016l.ttf \ + decorative/c059033l.ttf \ + decorative/c059036l.ttf \ + decorative/colourba.ttf \ + decorative/colourbb.ttf \ + decorative/counters.ttf \ + decorative/creditva.ttf \ + decorative/creditvb.ttf \ + decorative/creditvi.ttf \ + decorative/creditvz.ttf \ + decorative/d050000l.ttf \ + decorative/edmundis.ttf \ + decorative/edmunds.ttf \ + decorative/engeboit.ttf \ + decorative/engebold.ttf \ + decorative/engeexbi.ttf \ + decorative/engeexbo.ttf \ + decorative/engeexit.ttf \ + decorative/engeexpa.ttf \ + decorative/engeital.ttf \ + decorative/engeregu.ttf \ + decorative/goodfisb.ttf \ + decorative/goodfisc.ttf \ + decorative/goodfish.ttf \ + decorative/goodfisi.ttf \ + decorative/guanine_.ttf \ + decorative/gunplay.ttf \ + decorative/kirsty__.ttf \ + decorative/kirsty_b.ttf \ + decorative/kirsty_i.ttf \ + decorative/kirstybi.ttf \ + decorative/kirstyin.ttf \ + decorative/letstracebasic.ttf \ + decorative/letstraceruled.ttf \ + decorative/luximb.ttf \ + decorative/luximbi.ttf \ + decorative/luximr.ttf \ + decorative/luximri.ttf \ + decorative/luxirb.ttf \ + decorative/luxirbi.ttf \ + decorative/luxirr.ttf \ + decorative/luxirri.ttf \ + decorative/luxisb.ttf \ + decorative/luxisbi.ttf \ + decorative/luxisr.ttf \ + decorative/luxisri.ttf \ + decorative/mufferaw.ttf \ + decorative/n019003l.ttf \ + decorative/n019004l.ttf \ + decorative/n019023l.ttf \ + decorative/n019024l.ttf \ + decorative/n019043l.ttf \ + decorative/n019044l.ttf \ + decorative/n019063l.ttf \ + decorative/n019064l.ttf \ + decorative/n021003l.ttf \ + decorative/n021004l.ttf \ + decorative/n021023l.ttf \ + decorative/n021024l.ttf \ + decorative/n022003l.ttf \ + decorative/n022004l.ttf \ + decorative/n022023l.ttf \ + decorative/n022024l.ttf \ + decorative/nasaliza.ttf \ + decorative/numberpi.ttf \ + decorative/p052003l.ttf \ + decorative/p052004l.ttf \ + decorative/p052023l.ttf \ + decorative/p052024l.ttf \ + decorative/pricedow.ttf \ + decorative/pupcat__.ttf \ + decorative/rina.ttf \ + decorative/s050000l.ttf \ + decorative/sandoval.ttf \ + decorative/screenge.ttf \ + decorative/steelfib.ttf \ + decorative/steelfis.ttf \ + decorative/steelout.ttf \ + decorative/strenu3d.ttf \ + decorative/strenuou.ttf \ + decorative/subpear_.ttf \ + decorative/teen____.ttf \ + decorative/teenbdit.ttf \ + decorative/teenbold.ttf \ + decorative/teenital.ttf \ + decorative/teenlita.ttf \ + decorative/teenlite.ttf \ + decorative/typoderm.ttf \ + decorative/vahika_.ttf \ + decorative/vahikab.ttf \ + decorative/vahikac.ttf \ + decorative/vahikai.ttf \ + decorative/vectroid.ttf \ + decorative/velvenda.ttf \ + decorative/velvendc.ttf \ + decorative/vibroceb.ttf \ + decorative/vibrocei.ttf \ + decorative/vibrocen.ttf \ + decorative/vibrocex.ttf \ + decorative/wintermu.ttf \ + decorative/youregoi.ttf \ + decorative/youregon.ttf \ + decorative/z003034l.ttf \ + decorative/zekton__.ttf \ + decorative/zektonbi.ttf \ + decorative/zektonbo.ttf \ + decorative/zektonit.ttf \ + decorative/zorque.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 50c46e5eae27..eb5a07dd6da2 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -50,7 +50,7 @@ endif ifeq ($(WITH_EXTRA_FONT),YES) $(eval $(call gb_Module_add_targets,extras,\ - Package_extra_fonts \ + ExternalPackage_extra_fonts \ UnpackedTarball_fonts_pack \ )) endif diff --git a/extras/Package_extra_fonts.mk b/extras/Package_extra_fonts.mk deleted file mode 100644 index f37d4e79e968..000000000000 --- a/extras/Package_extra_fonts.mk +++ /dev/null @@ -1,187 +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_extra_fonts,$(call gb_UnpackedTarball_get_dir,fonts-pack)/decorative)) - -$(eval $(call gb_Package_use_unpacked,extras_extra_fonts,fonts-pack)) - -$(eval $(call gb_Package_add_files,extras_extra_fonts,pck,\ - BETSY2.ttf \ - Berylibi.ttf \ - Beryliub.ttf \ - Beryliui.ttf \ - Berylium.ttf \ - CHOPS___.TTF \ - DTPDingbats.ttf \ - GenAI102.TTF \ - GenAR102.TTF \ - GenI102.TTF \ - GenR102.TTF \ - Justus-Bold.ttf \ - Justus-Italic.ttf \ - Justus-ItalicOldstyle.ttf \ - Justus-Oldstyle.ttf \ - Justus-Roman.ttf \ - Justus-Versalitas.ttf \ - MgOpenCanonicaBold.ttf \ - MgOpenCanonicaBoldItalic.ttf \ - MgOpenCanonicaItalic.ttf \ - MgOpenCanonicaRegular.ttf \ - NEUROPOL.ttf \ - SAPPM___.ttf \ - Tuffy.ttf \ - Tuffy_Bold.ttf \ - Tuffy_Bold_Italic.ttf \ - Tuffy_Italic.ttf \ - Verina_Sans_Bold.otf \ - Verina_Sans_Bold_Oblique.otf \ - Verina_Sans_Mono.otf \ - Verina_Sans_Mono_Bold.otf \ - Verina_Sans_Mono_Bold_Oblique.otf \ - Verina_Sans_Mono_Oblique.otf \ - Verina_Sans_Oblique.otf \ - Verina_Sans_Roman.otf \ - Verina_Serif.otf \ - Verina_Serif_Bold.otf \ - a010013l.ttf \ - a010015l.ttf \ - a010033l.ttf \ - a010035l.ttf \ - airmole.ttf \ - airmolea.ttf \ - airmoleq.ttf \ - airmoles.ttf \ - astronbi.ttf \ - astronbo.ttf \ - astronbv.ttf \ - astronbw.ttf \ - b018012l.ttf \ - b018015l.ttf \ - b018032l.ttf \ - b018035l.ttf \ - baveuse.ttf \ - bluebold.ttf \ - bluecond.ttf \ - bluehigh.ttf \ - bluehigl.ttf \ - bullpen3.ttf \ - bullpen_.ttf \ - bullpeni.ttf \ - c059013l.ttf \ - c059016l.ttf \ - c059033l.ttf \ - c059036l.ttf \ - colourba.ttf \ - colourbb.ttf \ - counters.ttf \ - creditva.ttf \ - creditvb.ttf \ - creditvi.ttf \ - creditvz.ttf \ - d050000l.ttf \ - edmundis.ttf \ - edmunds.ttf \ - engeboit.ttf \ - engebold.ttf \ - engeexbi.ttf \ - engeexbo.ttf \ - engeexit.ttf \ - engeexpa.ttf \ - engeital.ttf \ - engeregu.ttf \ - goodfisb.ttf \ - goodfisc.ttf \ - goodfish.ttf \ - goodfisi.ttf \ - guanine_.ttf \ - gunplay.ttf \ - kirsty__.ttf \ - kirsty_b.ttf \ - kirsty_i.ttf \ - kirstybi.ttf \ - kirstyin.ttf \ - letstracebasic.ttf \ - letstraceruled.ttf \ - luximb.ttf \ - luximbi.ttf \ - luximr.ttf \ - luximri.ttf \ - luxirb.ttf \ - luxirbi.ttf \ - luxirr.ttf \ - luxirri.ttf \ - luxisb.ttf \ - luxisbi.ttf \ - luxisr.ttf \ - luxisri.ttf \ - mufferaw.ttf \ - n019003l.ttf \ - n019004l.ttf \ - n019023l.ttf \ - n019024l.ttf \ - n019043l.ttf \ - n019044l.ttf \ - n019063l.ttf \ - n019064l.ttf \ - n021003l.ttf \ - n021004l.ttf \ - n021023l.ttf \ - n021024l.ttf \ - n022003l.ttf \ - n022004l.ttf \ - n022023l.ttf \ - n022024l.ttf \ - nasaliza.ttf \ - numberpi.ttf \ - p052003l.ttf \ - p052004l.ttf \ - p052023l.ttf \ - p052024l.ttf \ - pricedow.ttf \ - pupcat__.ttf \ - rina.ttf \ - s050000l.ttf \ - sandoval.ttf \ - screenge.ttf \ - steelfib.ttf \ - steelfis.ttf \ - steelout.ttf \ - strenu3d.ttf \ - strenuou.ttf \ - subpear_.ttf \ - teen____.ttf \ - teenbdit.ttf \ - teenbold.ttf \ - teenital.ttf \ - teenlita.ttf \ - teenlite.ttf \ - typoderm.ttf \ - vahika_.ttf \ - vahikab.ttf \ - vahikac.ttf \ - vahikai.ttf \ - vectroid.ttf \ - velvenda.ttf \ - velvendc.ttf \ - vibroceb.ttf \ - vibrocei.ttf \ - vibrocen.ttf \ - vibrocex.ttf \ - wintermu.ttf \ - youregoi.ttf \ - youregon.ttf \ - z003034l.ttf \ - zekton__.ttf \ - zektonbi.ttf \ - zektonbo.ttf \ - zektonit.ttf \ - zorque.ttf \ -)) - -# vim: set noet sw=4 ts=4: -- cgit