diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-16 18:25:16 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-16 19:29:03 +0200 |
| commit | af69e72e1d6c04e23f17c4d1e58aa891b95611ee (patch) | |
| tree | 8975b218f6f754f1313c01d57fa0329377caeda1 | |
| parent | 4054dd8fc407f7766710beaac575b20a809a912c (diff) | |
avoid defining gb_TAILBUILDMODULES, use the command only when necessary
This enables to properly use make <module>.all for builds without
dictionaries and hopefully also solves the problem behind
5133d3c48fd6d2a795e42b87a1e7b464946606a3
Change-Id: I43872864aa135014ea51d15b34ef4de151f14c3d
| -rw-r--r-- | Makefile.top | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/Makefile.top b/Makefile.top index b23b5be1a0dd..d08cd5ed4d7e 100644 --- a/Makefile.top +++ b/Makefile.top @@ -247,10 +247,6 @@ xpdf\ xsltml\ zlib\ -ifneq ($(wildcard dictionaries/Module_dictionaries.mk),) -gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) -endif - export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules @@ -259,16 +255,14 @@ define gbuild_module_rules $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T -ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),) -$(1).all: bootstrap fetch - cd $(1) && unset MAKEFLAGS && \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -else $(1).all: bootstrap fetch - cd tail_build && unset MAKEFLAGS && \ - export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \ - $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) -endif + $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ + cd tail_build && unset MAKEFLAGS && \ + export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \ + , \ + cd $(1) && unset MAKEFLAGS && \ + ) \ + $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) $(1).clean: cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T |