[Libreoffice-commits] .: RepositoryExternal.mk Repository.mk

David Tardon dtardon at kemper.freedesktop.org
Tue Jul 26 00:59:45 PDT 2011


 Repository.mk         |    1 -
 RepositoryExternal.mk |    9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1a181ab015a3bd6b0d0695d30f803cd0107d3d18
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 26 09:58:54 2011 +0200

    add icui18n to external libs

diff --git a/Repository.mk b/Repository.mk
index 69ea9f0..b1bf955 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -141,7 +141,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	test \
     fileacc \
-    icui18n \
 ))
 
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 791c5d5..a4d29a8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -317,6 +317,9 @@ endif # SYSTEM_GRAPHITE
 
 ifeq ($(SYSTEM_ICU),YES)
 
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+endef
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_libs,$(1),-licule)
 endef
@@ -327,10 +330,16 @@ endef
 else # !SYSTEM_ICU
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	icui18n \
 	icule \
 	icuuc \
 ))
 
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icui18n \
+)
+endef
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 	icule \


More information about the Libreoffice-commits mailing list