Makefile.top | 4 ++-- Module_tail_build.mk | 6 +++--- solenv/gbuild/gbuild.mk | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-)
New commits: commit 3b9483e397c91902a3d7ccc8fbc551ff335ff65c Author: Bjoern Michaelsen <[email protected]> Date: Tue Dec 4 16:36:59 2012 +0100 make 'make tail_build' work again from the toplevel also: - tail_build.all - tail_build.build - tail_build.check diff --git a/Makefile.top b/Makefile.top index a5f73ae..4f445cb 100644 --- a/Makefile.top +++ b/Makefile.top @@ -29,7 +29,7 @@ endif # by the module being mentioned in packimages/prj/build.lst, etc, recursively. $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(SRCDIR)/config_host.mk mkdir -p $(dir $@) - echo -n "gbuild_modules:= " > $@ + echo -n "gbuild_modules:= tail_build \\" > $@ for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@ echo >> $@ echo -n "dmake_modules:= " >> $@ @@ -49,7 +49,7 @@ $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T $(1).all: bootstrap fetch - $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) tail_build), \ cd tail_build && unset MAKEFLAGS && \ export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \ , \ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index e0664bb..58eb4f5 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -22,9 +22,9 @@ # instead of those above. -$(eval $(call gb_Module_Module,tail_end)) +$(eval $(call gb_Module_Module,tail_build)) -$(eval $(call gb_Module_add_moduledirs,tail_end,\ +$(eval $(call gb_Module_add_moduledirs,tail_build,\ accessibility \ $(call gb_Helper_optional,AFMS,afms) \ animations \ @@ -205,7 +205,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ )) ifeq ($(MERGELIBS),TRUE) -$(eval $(call gb_Module_add_targets,tail_end,\ +$(eval $(call gb_Module_add_targets,tail_build,\ Library_merged \ )) endif commit 878ecbaf8985be0517fdbb2785b3864fbc9afcf6 Author: Bjoern Michaelsen <[email protected]> Date: Tue Dec 4 15:21:00 2012 +0100 revert the huge performance regression in gbuild intoduced with 0a45deba2be4a77db7540bd050b25bd6c26d7513 - we should default to make -r - everything else grows exponentially with the number of targets - gbuild should now have sane noop builds again even on make 3.82 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d0440b4..6f3a99c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -48,10 +48,19 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild .DELETE_ON_ERROR: +# do not use built-in rules +# DO NOT TOUCH THIS LINE UNLESS YOU REALLY KNOW WHAT YOU ARE DOING +# REMOVING THIS MAKES e.g. MODULE SW ALONE SLOWER BY SOME 300% +# FOR TAIL_BUILD THE IMPACT IS HUGE! +# (unless you are doing make -r, which we should explicitly NOT require from +# users) +MAKEFLAGS+=-r + # by default gbuild use /bin/sh # if you want to use a particular shell # you can export gb_SHELL=<path_to_shell> # + ifdef gb_SHELL SHELL := $(gb_SHELL) else _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
