From e1999381b3c32db9946dc3469665f4c9ffd08de1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 13 Apr 2011 16:11:40 +0000 Subject: [PATCH] gnumake4: #i117610#: move icule to RepositoryExternal.mk [hg:e86f5a26e982] --- Repository.mk | 1 - RepositoryExternal.mk | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Repository.mk b/Repository.mk index ac75959b91c9..103a6780fb32 100755 --- a/Repository.mk +++ b/Repository.mk @@ -105,7 +105,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ cppunit \ - icule \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5c5c21082920..1e42557fe33d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -290,6 +290,9 @@ endif # SYSTEM_GRAPHITE ifeq ($(SYSTEM_ICU),YES) +define gb_LinkTarget__use_icule +$(call gb_LinkTarget_add_libs,$(1),-licule) +endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_libs,$(1),-licuuc) endef @@ -297,9 +300,15 @@ endef else # !SYSTEM_ICU $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + icule \ icuuc \ )) +define gb_LinkTarget__use_icule +$(call gb_LinkTarget_add_linked_libs,$(1),\ + icule \ +) +endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_linked_libs,$(1),\ icuuc \