From e2b3be6416df0c8913b2d6bb32c34fe162a0a019 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 21 Jan 2012 19:36:01 +0100 Subject: officecfg: namespace prefix make variable FILES --- officecfg/Package_cppheader.mk | 4 ++-- officecfg/registry/Makefile | 2 +- officecfg/registry/files.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'officecfg') diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk index b90102b2168d..2a3b01f41bee 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 edb80b0c0131..50d872c4c94c 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 f4c72d7b9437..21a4a15c1f03 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -1,4 +1,4 @@ -FILES = \ +officecfg_FILES = \ FirstStartWizard \ Inet \ Interaction \ -- cgit