diff options
| author | David Tardon <dtardon@redhat.com> | 2014-01-08 13:49:46 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-01-08 13:50:37 +0100 |
| commit | 6c1614a6f000a8ef18ce0de241af649ac9588477 (patch) | |
| tree | 488487003fec785d065c8c839d3d28277c543b93 | |
| parent | 46cf9aed39ac50219a4e8dbcf0b16359cb3644ee (diff) | |
sal_textenc is a runtime dep of cppumaker
Change-Id: I9fd91ee8c15479e9956daa5c85a09f141ef6cc3f
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | codemaker/Executable_cppumaker.mk | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 014787627446..98736fc41bfb 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 049e0c7c6da4..26347a07976a 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 \ )) |