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

[Michael Stahl]

 RepositoryExternal.mk    |    1 +
 solenv/gbuild/Gallery.mk |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d764100d620ab8331a8d6bb80984ace09ec65b5c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 27 11:40:16 2015 +0100

    try to fix gengal dependencies
    
    The component files are not necessary as gb_Executable__register_gengal
    already adds the service.rdb; the gengal.rc is insufficient as that file
    references fundamental.rc which is missing, so depend on the Package
    instead.  Also, INSTDIR is wrong for cross-compile.
    
    Change-Id: I30711a51e04539832657a242d2573c626b1cf8ec

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3830d14..994348f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
 	$(call gb_Package_get_target_for_build,postprocess_images) \
 	$(call gb_Package_get_target_for_build,postprocess_registry) \
 	$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
+	$(call gb_Package_get_target_for_build,instsetoo_native_setup) \
 	$(call gb_Rdb_get_target_for_build,ure/services) \
 	$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
 	$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a923d0a..2ce708d 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-		$(call gb_Executable_get_runtime_dependencies,gengal) \
-		$(INSTROOT)/$(LIBO_ETC_FOLDER)/services/services.rdb \
-		$(INSTROOT)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,gengal) \
-	    $(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
-	    $(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
+		$(call gb_Executable_get_runtime_dependencies,gengal)
 	$(call gb_Gallery__command,$@,$*)
 
 $(call gb_Gallery__get_final_target,%) :