Makefile.top | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
New commits:
commit af69e72e1d6c04e23f17c4d1e58aa891b95611ee
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Aug 16 18:25:16 2012 +0200
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
diff --git a/Makefile.top b/Makefile.top
index b23b5be..d08cd5e 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
