diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-10 10:01:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-10 10:01:06 +0100 |
commit | e2b62889c82d0a3295c9be0315fadb5bba504c99 (patch) | |
tree | c290a0f3b9964dad70b034017c5608469fa1b902 | |
parent | c67b55db4adad67a8584b00f88b7ed296ba15846 (diff) |
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
-rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 344d35731812..cf3e71fb1ff3 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 |