[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - basctl/Module_basctl.mk bin/gbuild-to-ide chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module_desktop.mk filter/Module_filter.mk formula/Module_formula.mk fpicker/Module_fpicker.mk Makefile.in postprocess/CustomTarget_signing.mk reportdesign/Module_reportdesign.mk RepositoryModule_host.mk sc/Module_sc.mk sd/Module_sd.mk sfx2/Module_sfx2.mk solenv/gbuild starmath/Module_starmath.mk svtools/Module_svtools.mk svx/Module_svx.mk sw/Module_sw.mk uui/Module_uui.mk vcl/Module_vcl.mk xmlsecurity/Module_xmlsecurity.mk

Stephan Bergmann sbergman at redhat.com
Wed Nov 9 18:37:12 UTC 2016

On 08/17/2016 09:47 AM, Armin Le Grand wrote:
> commit f4ba3e9df26ce76abe345de696ad900bb4e130c5
> Author: Armin Le Grand <Armin.Le.Grand at cib.de>
> Date:   Wed Aug 17 09:43:33 2016 +0200
>     added and adapted to target screenshot
>     Up to now the screenshot creation was added/dependent of
>     target slowcheck. Since quite some modules have added screenshot
>     creations now, I added an own target 'screenshot' to allow to keep
>     current slowcheck and screenshot creation separated
>     Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7
> diff --git a/Makefile.in b/Makefile.in
> index ef56bee..1cf3837 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -95,7 +95,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))
> +	$$(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))

That means that 'make MODULE.all' now also builds MODULE.screenshot, 
even though a plain top-level 'make' does /not/ make any (top-level or 
per-module) screenshot targets.  In other words, 'make MODULE.all' is no 
longer doing a subset of what a top-level 'make' does.  Is that 
intentional, or should this part be reverted?

More information about the LibreOffice mailing list