[Libreoffice-commits] core.git: Makefile.in
Stephan Bergmann
sbergman at redhat.com
Thu Nov 10 09:04:09 UTC 2016
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e2b62889c82d0a3295c9be0315fadb5bba504c99
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 10 10:01:06 2016 +0100
Don't let MODULE.all depend on MODULE.screenshot
...as that, somewhat surprisingly, causes 'make MODULE.all' do additional
targets that a plain top-level 'make' would never do. See discussion in mail
thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2016-November/075797.html>
"[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' [...]".
Change-Id: I460f3c91cf00d3398c61833fdcd5eaebdc87fbf2
diff --git a/Makefile.in b/Makefile.in
index 344d357..cf3e71f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
$(1).all: bootstrap fetch
- $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) $(WORKDIR)/Module/screenshot/$(1))
+ $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1))
endef
More information about the Libreoffice-commits
mailing list