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

[Samuel Thibault]

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

New commits:
commit 77b09e7f921c42c41171e431813652db6de54679
Author: Samuel Thibault <sthibault at hypra.fr>
Date:   Wed Mar 14 13:37:31 2018 +0100

    gbuild: add target rules for all modules
    
    This allows to run e.g. make UIConfig to automatically run make
    UIConfig_<module> for all modules.
    
    Change-Id: Idc2c3a61fd38b486435366164031b4d51f68eebc
    Reviewed-on: https://gerrit.libreoffice.org/51274
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/Makefile.in b/Makefile.in
index f149a7ee79b4..3cce173bcdf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,6 +165,9 @@ gbuild_TARGETS := AllLangHelp \
 $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules),$(target)_$(module)/%)) UIConfig_modules/% %.genpatch: bootstrap fetch
 	$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
 
+$(gbuild_TARGETS):
+	$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
+
 #
 # Clean
 #
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 688f5963a1f5..2aa0fc8d65b2 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -88,7 +88,8 @@ endef
 #
 # gb_Helper_make_userfriendly_targets target class build-target? clean-target?
 define gb_Helper_make_userfriendly_targets
-.PHONY: $(2)_$(1) $(2)_$(1).clean
+.PHONY: $(2) $(2)_$(1) $(2)_$(1).clean
+$(2): $(2)_$(1)
 $(2)_$(1) : $(if $(3),$(3),$(call gb_$(2)_get_target,$(1)))
 $(2)_$(1).clean : $(if $(4),$(4),$(call gb_$(2)_get_clean_target,$(1)))