[Libreoffice-commits] .: 6 commits - configure.in i18npool/Library_i18npool.mk solenv/gbuild

David Tardon dtardon at redhat.com
Wed May 16 22:35:27 PDT 2012


On Wed, May 16, 2012 at 03:00:33PM -0700, Michael Stahl wrote:
> commit b6076ec3c1b9c384d8229cd079c39f510a9f38f7
> Author: Michael Stahl <mstahl at redhat.com>
> Date:   Wed May 16 20:32:28 2012 +0200
> 
>     gbuild: fix build executable dependencies:
>     
>     Rules that invoke generated executables should have dependencies on
>     those executables.
> 
> @@ -188,7 +189,7 @@ $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2
>  $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf
>  $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
>  $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
> -$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
> +$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET)

Ehm, the dependency on $(gb_Extension_HELPEXTARGET) is already there .-)

> commit 07c0b800d9d70857882238204820f75b8dc98b26
> Author: Michael Stahl <mstahl at redhat.com>
> Date:   Wed May 16 13:48:37 2012 +0200
> 
>     fix spurious re-delivery of RDB files:
>     
>     The OUTDIR RDB depends on Packages for IDL and headers, the latter of
>     which depends on the WORKDIR RDB, hence preserving timestamps here leads
>     to spurious re-delivery because the OUTDIR RDB always has older
>     timestamp than the headers Package.

Actually, these dependencies could (should) be replaced by order-only
dependencies. They are only there to ensure the headers and IDL files
are delivered properly.

D.


More information about the LibreOffice mailing list