summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-12-02 18:56:17 +0100
committerMichael Stahl <mstahl@redhat.com>2012-12-02 20:58:32 +0100
commit1658e4efac5fc851b322103ed40545fa263ae280 (patch)
treeea7837941d9818b65eb36e44ceeb86b0d819ab81 /Library_merged.mk
parent63614919195934a764eacb509d75d15f8b243a48 (diff)
RepositoryExternal.mk: clean up awful icudata/icui18n duplication
Change-Id: Ic4794d9a908b60220a4a849ff263eaa08776550c
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 61de3a2e2f12..58e219cbf92f 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(eval $(call gb_Library_use_externals,merged,\
cups \
+ icui18n \
icule \
icuuc \
jpeg \
@@ -121,13 +122,6 @@ $(eval $(call gb_Library_add_ldflags,merged,\
/ignore:4049 \
/ignore:4217 \
))
-$(eval $(call gb_Library_use_externals,merged,\
- icuin \
-))
-else
-$(eval $(call gb_Library_use_externals,merged,\
- icui18n \
-))
endif
ifeq ($(OS),MACOSX)