[Libreoffice-commits] core.git: codemaker/Executable_cppumaker.mk RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk             |    6 ++++++
 codemaker/Executable_cppumaker.mk |    1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6c1614a6f000a8ef18ce0de241af649ac9588477
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 8 13:49:46 2014 +0100

    sal_textenc is a runtime dep of cppumaker
    
    Change-Id: I9fd91ee8c15479e9956daa5c85a09f141ef6cc3f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0147876..98736fc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3085,6 +3085,12 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
 )
 endef
 
+define gb_Executable__register_cppumaker
+$(call gb_Executable_add_runtime_dependencies,cppumaker,\
+	$(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
+)
+endef
+
 gb_Gallery__UNO_COMPONENTS := \
 	comphelper/util/comphelp \
 	configmgr/source/configmgr \
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index 049e0c7..26347a0 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,cppumaker,\
     sal \
-    sal_textenc \
     salhelper \
     unoidl \
 ))