summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-01-21 19:36:01 +0100
committerMichael Stahl <mstahl@redhat.com>2012-01-21 22:13:32 +0100
commite2b3be6416df0c8913b2d6bb32c34fe162a0a019 (patch)
treec570a935ab042ac349e80dcfb8033319d7db2d6b /officecfg
parent5967ac28790c9936ba4251806538abc1d590bfdb (diff)
officecfg: namespace prefix make variable FILES
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/Package_cppheader.mk4
-rw-r--r--officecfg/registry/Makefile2
-rw-r--r--officecfg/registry/files.mk2
3 files changed, 4 insertions, 4 deletions
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 \