[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

David Tardon dtardon at redhat.com
Wed Dec 24 09:31:55 PST 2014


 RepositoryExternal.mk      |    1 +
 solenv/gbuild/CliUnoApi.mk |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7b4aa22ebbaf24c5e98ef7311cc88f7e99f71f0
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 24 18:27:48 2014 +0100

    all deps for tools are expected to be at one place
    
    Change-Id: Ie0d359f6607811cd76aefe4e19d0fb05379f1762

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6360652a..06088c8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3768,6 +3768,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(call gb_UnoApi_get_target,udkapi) \
+	$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
 )
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index 4c0b9aa..16f331b 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -13,8 +13,7 @@ gb_CliUnoApi_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliUnoApi_KEYFILE_DEFAULT := $(gb_CliAssembly_KEYFILE_DEFAULT)
 
-gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) \
-    $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
+gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
 gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApi__command


More information about the Libreoffice-commits mailing list