diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-12-02 18:56:17 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-12-02 20:58:32 +0100 |
| commit | 1658e4efac5fc851b322103ed40545fa263ae280 (patch) | |
| tree | ea7837941d9818b65eb36e44ceeb86b0d819ab81 /i18npool | |
| parent | 63614919195934a764eacb509d75d15f8b243a48 (diff) | |
RepositoryExternal.mk: clean up awful icudata/icui18n duplication
Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/CppunitTest_i18npool_test_textsearch.mk | 2 | ||||
| -rw-r--r-- | i18npool/Executable_gencoll_rule.mk | 8 | ||||
| -rw-r--r-- | i18npool/Executable_genindex_data.mk | 8 | ||||
| -rw-r--r-- | i18npool/Library_i18npool.mk | 7 | ||||
| -rw-r--r-- | i18npool/Library_i18nsearch.mk | 2 |
5 files changed, 2 insertions, 25 deletions
diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index b563ac1f8dbb..2f6998f94be8 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -26,7 +26,7 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\ )) $(eval $(call gb_CppunitTest_use_externals,i18npool_test_textsearch,\ - $(if $(filter MSC,$(COM)),icuin,icui18n) \ + icui18n \ icuuc \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index d0ef67acc5a9..4974c6335ee4 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -38,19 +38,11 @@ $(eval $(call gb_Executable_use_libraries,gencoll_rule,\ $(gb_UWINAPI) \ )) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_Executable_use_externals,gencoll_rule,\ - icudt \ - icuin \ - icuuc \ -)) -else $(eval $(call gb_Executable_use_externals,gencoll_rule,\ icudata \ icui18n \ icuuc \ )) -endif $(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\ i18npool/source/collator/gencoll_rule \ diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 2c36e3e3123a..0795b7bb2c51 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -37,19 +37,11 @@ $(eval $(call gb_Executable_use_libraries,genindex_data,\ $(gb_UWINAPI) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_use_externals,gencoll_rule,\ - icudt \ - icuin \ - icuuc \ -)) -else $(eval $(call gb_Executable_use_externals,genindex_data,\ icudata \ icui18n \ icuuc \ )) -endif $(eval $(call gb_Executable_add_exception_objects,genindex_data,\ i18npool/source/indexentry/genindex_data \ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 1e26716a3d5b..183ea54ecabd 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -47,17 +47,10 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ $(gb_UWINAPI) \ )) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_Library_use_externals,i18npool,\ - icuin \ - icuuc \ -)) -else $(eval $(call gb_Library_use_externals,i18npool,\ icui18n \ icuuc \ )) -endif $(eval $(call gb_Library_add_exception_objects,i18npool,\ i18npool/source/breakiterator/breakiterator_cjk \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index d59345e91574..77780775ca56 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,i18nsearch,\ $(eval $(call gb_Library_use_sdk_api,i18nsearch)) $(eval $(call gb_Library_use_externals,i18nsearch,\ - $(if $(filter MSC,$(COM)),icuin,icui18n) \ + icui18n \ icuuc \ )) |