[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

[Markus Mohrhard]

 Makefile.in             |    2 +-
 solenv/gbuild/Module.mk |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c835ed0229f4647bd14344195e212fb7602506b5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 1 16:32:56 2017 +0100

    uitest: finally a working dependency on the build target for uicheck
    
    Change-Id: Icaf1de556ae20027e27321750197ed574b508435

diff --git a/Makefile.in b/Makefile.in
index 7146be0..080ba46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
- $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
  $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index dd159a74..24f932c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -372,6 +372,11 @@ define gb_Module_add_uicheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),uicheck target)
 
 $(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+$$(gb_Module_CURRENTTARGET) :| \
+	$(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
+    $(call gb_Package_get_target,instsetoo_native_setup) \
+    $(call gb_Package_get_target,instsetoo_native_setup_ure)
+$(call gb_Module_get_uicheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef