summaryrefslogtreecommitdiff
path: root/officecfg/CustomTarget_registry.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-07 14:23:10 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-07 17:07:43 +0200
commit368e06b05affe72b7589b340b2b557c4d387c298 (patch)
tree32db7d18525d615045e4f5453eca07b383a57448 /officecfg/CustomTarget_registry.mk
parentff9fbfd9c9e9a1caa72601df951a7fd85eb8fcc1 (diff)
officecfg: remove Package_cppheader
Instead include generated headers directly from workdir. Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65
Diffstat (limited to 'officecfg/CustomTarget_registry.mk')
-rw-r--r--officecfg/CustomTarget_registry.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index aaf6f16089b2..a482585d0323 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
$(call gb_CustomTarget_get_target,officecfg/registry) : \
$(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\
- $(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx)
+ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/$(i).hxx)
# auto generated header file for unit test qa/cppheader.cxx
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \
$(SRCDIR)/officecfg/files.mk
$(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1)
mkdir -p $(dir $@) && \
@@ -25,7 +25,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.h
# pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return
officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1)
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/%.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \
$(SRCDIR)/officecfg/registry/schema/org/openoffice/%.xcs \
$(SRCDIR)/officecfg/registry/cppheader.xsl\
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)