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 /RepositoryExternal.mk | |
| parent | 63614919195934a764eacb509d75d15f8b243a48 (diff) | |
RepositoryExternal.mk: clean up awful icudata/icui18n duplication
Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5ead1031b997..2159be13197d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -871,18 +871,15 @@ ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudt \ icuin \ - icule \ - icutu \ - icuuc \ )) -define gb_LinkTarget__use_icudt +define gb_LinkTarget__use_icudata $(call gb_LinkTarget_use_libraries,$(1),\ icudt \ ) endef -define gb_LinkTarget__use_icuin +define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_use_libraries,$(1),\ icuin \ ) @@ -892,9 +889,6 @@ else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icudata$(gb_ICU_suffix) \ icui18n$(gb_ICU_suffix) \ - icule$(gb_ICU_suffix) \ - icutu$(gb_ICU_suffix) \ - icuuc$(gb_ICU_suffix) \ )) define gb_LinkTarget__use_icudata @@ -911,6 +905,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef endif +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + icule$(gb_ICU_suffix) \ + icutu$(gb_ICU_suffix) \ + icuuc$(gb_ICU_suffix) \ +)) + define gb_LinkTarget__use_icule $(call gb_LinkTarget_use_libraries,$(1),\ icule$(gb_ICU_suffix) \ |