diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
commit | 5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch) | |
tree | 6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /i18npool | |
parent | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff) |
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.
Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'i18npool')
21 files changed, 0 insertions, 42 deletions
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index c51f0a1630ce..24f67623d6d4 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_breakiterator)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ i18npool/qa/cppunit/test_breakiterator \ )) diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 086dec586d1f..62f852d7a2d2 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_characterclassification)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\ i18npool/qa/cppunit/test_characterclassification \ )) diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk index 7043f320c028..610791cedbae 100644 --- a/i18npool/CppunitTest_i18npool_test_languagetag.mk +++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk @@ -23,8 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_languagetag)) - ifeq ($(ENABLE_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\ liblangtag \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index ed943389e970..c9236da6a47c 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -22,8 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,i18npool_test_ordinalsuffix)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\ i18npool/qa/cppunit/test_ordinalsuffix \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 82aafdb4cea0..d0ef67acc5a9 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gencoll_rule)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index 22ea9c5d54d1..70ec6c97dd2f 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genconv_dict)) - $(eval $(call gb_Executable_add_exception_objects,genconv_dict,\ i18npool/source/textconversion/genconv_dict \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index 38aae75eb138..3b63cfc5eea5 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,gendict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,gendict)) - $(eval $(call gb_Executable_add_exception_objects,gendict,\ i18npool/source/breakiterator/gendict \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index c6b532192466..2c36e3e3123a 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,genindex_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,genindex_data)) - ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudt \ diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index b61799d690d1..ba0be63c5fc9 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Executable_use_libraries,saxparser,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,saxparser)) - $(eval $(call gb_Executable_add_exception_objects,saxparser,\ i18npool/source/localedata/LocaleNode \ i18npool/source/localedata/filewriter \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index a136cef873e0..952cbc667335 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,collator_data)) - $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),\ CustomTarget/i18npool/collator/collator_$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index a22555b231f5..70e33cca4d02 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_ja)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/breakiterator/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index 8b80f193de23..56d4dc987c75 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dict_zh)) - $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/breakiterator/dict_zh \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 422d9cde94f6..3432d9d25329 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nisolang1,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nisolang1)) - $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ i18npool/source/isolang/insys \ i18npool/source/isolang/isolang \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 81486613da42..1e26716a3d5b 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18npool)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,i18npool,\ icuin \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 828ec2ba37ca..d4499c8cade1 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_use_libraries,i18nsearch,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,i18nsearch)) - $(eval $(call gb_Library_add_exception_objects,i18nsearch,\ i18npool/source/search/levdis \ i18npool/source/search/textsearch \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 79f1cd93a64b..d60870770a44 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,index_data,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,index_data)) - $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),\ CustomTarget/i18npool/indexentry/$(notdir $(basename $(txt)))) \ diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index a5cf7a780676..d5a2c9349460 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_en)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/localedata/localedata_en_AU \ CustomTarget/i18npool/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 75ba17341a33..4b9931715054 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_es,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_es)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ CustomTarget/i18npool/localedata/localedata_es_AR \ CustomTarget/i18npool/localedata/localedata_es_BO \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index ad3ebc679071..1122d0c2b1a5 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_euro,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_euro)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index b18593db55bf..66aab48d2466 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_libraries,localedata_others,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,localedata_others)) - $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index a568534c0a97..23afa2113a7c 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,textconv_dict)) - $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),\ CustomTarget/i18npool/textconversion/$(notdir $(basename $(txt)))) \ |