Kaydet (Commit) e3a903fd authored tarafından Michael Stahl's avatar Michael Stahl

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
(cherry picked from commit d764100d)
üst 0c86ca76
...@@ -3755,6 +3755,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ ...@@ -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_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \ $(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_ure) \
$(call gb_Package_get_target_for_build,instsetoo_native_setup) \
$(call gb_Rdb_get_target_for_build,ure/services) \ $(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \ $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,offapi) \ $(call gb_UnoApi_get_target,offapi) \
......
...@@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir : ...@@ -68,11 +68,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \ $(call gb_Gallery_get_target,%) : \
$(call gb_Executable_get_runtime_dependencies,gengal) \ $(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_Gallery__command,$@,$*) $(call gb_Gallery__command,$@,$*)
$(call gb_Gallery__get_final_target,%) : $(call gb_Gallery__get_final_target,%) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment