[Libreoffice-commits] core.git: extras/CustomTarget_autocorr.mk extras/CustomTarget_autotextshare.mk

[Laurent Balland-Poirier]

 extras/CustomTarget_autocorr.mk      |   46 ---------------
 extras/CustomTarget_autotextshare.mk |  101 -----------------------------------
 2 files changed, 2 insertions(+), 145 deletions(-)

New commits:
commit 8791017b0ed7fe47a4367e73e1728ba1d2b15d83
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Tue Aug 12 15:32:39 2014 +0200

    Simplify make file for autocorr and autotext
    
    Build mimetype file list with other lists
    
    Change-Id: Ia30fd6af9d312e4eb7d68b6460221a55f608a808
    Reviewed-on: https://gerrit.libreoffice.org/10887
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index d119e9e..88edc87 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -240,51 +240,7 @@ extras_AUTOCORR_XMLFILES := \
 	zh-TW/SentenceExceptList.xml \
 
 
-extras_AUTOCORR_MIMETYPEFILES := \
-	af-ZA/mimetype \
-	bg/mimetype \
-	ca/mimetype \
-	cs/mimetype \
-	da/mimetype \
-	de/mimetype \
-	en-AU/mimetype \
-	en-GB/mimetype \
-	en-US/mimetype \
-	en-ZA/mimetype \
-	es/mimetype \
-	fa/mimetype \
-	fi/mimetype \
-	fr/mimetype \
-	ga-IE/mimetype \
-	hr/mimetype \
-	hu/mimetype \
-	is/mimetype \
-	it/mimetype \
-	ja/mimetype \
-	ko/mimetype \
-	lb-LU/mimetype \
-	lt/mimetype \
-	mn/mimetype \
-	nl-BE/mimetype \
-	nl/mimetype \
-	pl/mimetype \
-	pt-BR/mimetype \
-	pt/mimetype \
-	ro/mimetype \
-	ru/mimetype \
-	sk/mimetype \
-	sl/mimetype \
-	sr-CS/mimetype \
-	sr-Latn-CS/mimetype \
-	sr-Latn-ME/mimetype \
-	sr-Latn-RS/mimetype \
-	sr-ME/mimetype \
-	sr-RS/mimetype \
-	sv/mimetype \
-	tr/mimetype \
-	vi/mimetype \
-	zh-CN/mimetype \
-	zh-TW/mimetype \
+extras_AUTOCORR_MIMETYPEFILES := $(foreach lang,$(extras_AUTOCORR_LANGS),$(firstword $(subst :, ,$(lang)))/mimetype)
 
 
 ifneq ($(sort $(foreach file,$(extras_AUTOCORR_XMLFILES),$(firstword $(subst /, ,$(file))))),$(sort $(foreach lang,$(extras_AUTOCORR_LANGS),$(firstword $(subst :, ,$(lang))))))
diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk
index e30c40d..844ac43 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3814,106 +3814,7 @@ extras_AUTOTEXTSHARE_XMLFILES := \
 	zh-TW/template/PT2/styles.xml \
 
 
-extras_AUTOTEXTSHARE_MIMETYPEFILES := \
-	af-ZA/standard/mimetype \
-	bg/crdbus50/mimetype \
-	bg/standard/mimetype \
-	bg/template/mimetype \
-	ca/standard/mimetype \
-	cs/crdbus50/mimetype \
-	cs/crdbus54/mimetype \
-	cs/standard/mimetype \
-	cs/template/mimetype \
-	da/crdbus50/mimetype \
-	da/standard/mimetype \
-	da/template/mimetype \
-	de/crdbus50/mimetype \
-	de/standard/mimetype \
-	de/template/mimetype \
-	en-AU/standard/mimetype \
-	en-GB/crdbus50/mimetype \
-	en-GB/standard/mimetype \
-	en-GB/template/mimetype \
-	en-US/crdbus50/mimetype \
-	en-US/standard/mimetype \
-	en-US/template/mimetype \
-	en-ZA/standard/mimetype \
-	es/crdbus50/mimetype \
-	es/standard/mimetype \
-	es/template/mimetype \
-	fa/standard/mimetype \
-	fi/standard/mimetype \
-	fr/crdbus50/mimetype \
-	fr/standard/mimetype \
-	fr/template/mimetype \
-	ga-IE/standard/mimetype \
-	hr/standard/mimetype \
-	hu/crdbus50/mimetype \
-	hu/crdbus54/mimetype \
-	hu/standard/mimetype \
-	hu/template/mimetype \
-	is/standard/mimetype \
-	it/crdbus50/mimetype \
-	it/standard/mimetype \
-	it/template/mimetype \
-	ja/crdbus50/mimetype \
-	ja/standard/mimetype \
-	ja/template/mimetype \
-	km/crdbus50/mimetype \
-	km/standard/mimetype \
-	km/template/mimetype \
-	ko/crdbus50/mimetype \
-	ko/standard/mimetype \
-	ko/template/mimetype \
-	lb-LU/standard/mimetype \
-	lt/standard/mimetype \
-	mn/crdbus50/mimetype \
-	mn/standard/mimetype \
-	mn/template/mimetype \
-	nl-BE/standard/mimetype \
-	nl/crdbus50/mimetype \
-	nl/standard/mimetype \
-	nl/template/mimetype \
-	pl/crdbus50/mimetype \
-	pl/standard/mimetype \
-	pl/template/mimetype \
-	pt-BR/crdbus50/mimetype \
-	pt-BR/standard/mimetype \
-	pt-BR/template/mimetype \
-	pt/crdbus50/mimetype \
-	pt/standard/mimetype \
-	pt/template/mimetype \
-	ro/standard/mimetype \
-	ru/crdbus50/mimetype \
-	ru/standard/mimetype \
-	ru/template/mimetype \
-	sk/crdbus50/mimetype \
-	sk/crdbus54/mimetype \
-	sk/standard/mimetype \
-	sk/template/mimetype \
-	sl/crdbus50/mimetype \
-	sl/crdbus54/mimetype \
-	sl/standard/mimetype \
-	sl/template/mimetype \
-	sr-CS/standard/mimetype \
-	sr-Latn-CS/standard/mimetype \
-	sr-Latn-ME/standard/mimetype \
-	sr-Latn-RS/standard/mimetype \
-	sr-ME/standard/mimetype \
-	sr-RS/standard/mimetype \
-	sv/crdbus50/mimetype \
-	sv/standard/mimetype \
-	sv/template/mimetype \
-	tr/crdbus50/mimetype \
-	tr/standard/mimetype \
-	tr/template/mimetype \
-	vi/standard/mimetype \
-	zh-CN/crdbus50/mimetype \
-	zh-CN/standard/mimetype \
-	zh-CN/template/mimetype \
-	zh-TW/crdbus50/mimetype \
-	zh-TW/standard/mimetype \
-	zh-TW/template/mimetype \
+extras_AUTOTEXTSHARE_MIMETYPEFILES := $(foreach atexts,$(extras_AUTOTEXTSHARE_AUTOTEXTS),$(atexts)/mimetype)
 
 
 ifneq ($(sort $(foreach file,$(extras_AUTOTEXTSHARE_XMLFILES),$(wordlist 1, 2, $(subst /, ,$(file))))),$(sort $(subst /, ,$(extras_AUTOTEXTSHARE_AUTOTEXTS))))