[Libreoffice] gbuild: variables in user makefiles

[Michael Stahl]

hi Stephan,

On 21/01/12 22:17, Michael Stahl wrote:
> commit e2b3be6416df0c8913b2d6bb32c34fe162a0a019
> Author: Michael Stahl <mstahl at redhat.com>
> Date:   Sat Jan 21 19:36:01 2012 +0100
> 
>     officecfg: namespace prefix make variable FILES

if you have to define variables in user makefiles (and in officecfg
there is a good reason to do that), then please note that they will
eventually end up in a single make process for the whose office, so
please prevent namespace collisions by prefixing with the module name.

> diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk
> index b90102b..2a3b01f 100644
> --- a/officecfg/Package_cppheader.mk
> +++ b/officecfg/Package_cppheader.mk
> @@ -39,7 +39,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,officecfg/registry, \
>  
>  $(eval $(call gb_CustomTarget_add_dependencies,officecfg/registry, \
>      officecfg/registry/cppheader.xsl \
> -    $(foreach i,$(FILES),officecfg/registry/schema/org/openoffice/$(i).xcs)))
> +    $(foreach i,$(officecfg_FILES),officecfg/registry/schema/org/openoffice/$(i).xcs)))
>  
> -$(eval $(foreach i,$(FILES),$(call \
> +$(eval $(foreach i,$(officecfg_FILES),$(call \
>      gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx)))
> diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile
> index edb80b0..50d872c 100644
> --- a/officecfg/registry/Makefile
> +++ b/officecfg/registry/Makefile
> @@ -33,7 +33,7 @@ include $(WFDIR)/files.mk
>  
>  .DEFAULT_GOAL := all
>  .PHONY: all
> -all: $(foreach i,$(FILES),$(i).hxx)
> +all: $(foreach i,$(officecfg_FILES),$(i).hxx)
>  
>  define my_target
>  $(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \
> diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
> index f4c72d7..21a4a15 100644
> --- a/officecfg/registry/files.mk
> +++ b/officecfg/registry/files.mk
> @@ -1,4 +1,4 @@
> -FILES = \
> +officecfg_FILES = \
>      FirstStartWizard \
>      Inet \
>      Interaction \