[Libreoffice-commits] core.git: Makefile.in

Stephan Bergmann sbergman at redhat.com
Wed Jun 29 13:05:58 UTC 2016


 Makefile.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 102d87fc3619368af903523108188680c07b6d0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 29 15:03:13 2016 +0200

    Fix inconsistent dependencies of "make $MODULE" vs. "make $MODULE.build" etc.
    
    ...where the latter failed to rebuild compilerplugins if necessary, while the
    former did.
    
    (No idea about the proper dependencies of "make $MODULE.showdeliverables".)
    
    Change-Id: Ib6f8e193445229745475aa52eb7a78ebb30e49e5

diff --git a/Makefile.in b/Makefile.in
index 6997756..2fb1f5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,10 @@ define gb_Top_GbuildModuleRules
 $(1): bootstrap fetch
 	cd $(SRCDIR)/$(2) && $$(MAKE) $(IWYU_OPTION) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
 
-$(1).build $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)):
+$(1).build $(1).check $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): bootstrap fetch
+	cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
+
+$(1).clean $(1).showdeliverables:
 	cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
 
 $(1).all: bootstrap fetch


More information about the Libreoffice-commits mailing list