diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-24 18:26:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-24 19:44:10 +0300 |
| commit | 25d88d2b8eebb4782a016e03aa8562ad9fa15b7b (patch) | |
| tree | 30b5cafa05573f31b9d044e314c170610310667d /i18npool/CustomTarget_collator.mk | |
| parent | 95711f5b9e7b6a982d1762d37d5a38e0f40b86f9 (diff) | |
More hacking on --with-locales
Propagate the restriction of locales into <config_locales.h>. Note that in the
normal case, with no locale restrictions, all the WITH_LOCALE_xx macros are
zero anyway, but WITH_LOCALE_ALL is one.
Restrict which character encodings are handled in
sal/textencsal/textenc/tables.cxx based on the WITH_LOCALE_ macros. (Don't
simply always do it for iOS.)
Massage the affected unit tests to not crash when only partial character
encoding information is present.
Change-Id: Ie2c882c262ebd0d2b37dde66b8fe3c3e2570da14
Diffstat (limited to 'i18npool/CustomTarget_collator.mk')
| -rw-r--r-- | i18npool/CustomTarget_collator.mk | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 9fea159df2fc..f9bb82077f13 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -55,20 +55,10 @@ $(i18npool_CODIR)/collator_%.cxx : \ $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) -define i18npool_echo_one_lang - echo '#define LOCAL_RULE_$(1)' >>$@ - -endef - $(i18npool_CODIR)/lrl_include.hxx : \ $(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \ $(firstword $(subst _, ,$(txt)))))"' > $@ -ifeq ($(WITH_LOCALES),) - echo '#define LOCAL_RULE_ALL' >>$@ -else - $(foreach txt,$(i18npool_COTXTS),$(call i18npool_echo_one_lang,$(subst .txt,,$(txt)))) -endif # vim: set noet sw=4 ts=4: |