diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-07 15:53:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-07 17:07:44 +0200 |
| commit | 38f5717b1d488b866d55a603eea1260c6203fd69 (patch) | |
| tree | cb359df6ed46c2e8fc4c62d514e0acd8157ed80e /writerfilter/CustomTarget_source.mk | |
| parent | 5a8f5914c2077fe330d713a5d3a2be3b3f6a7e9a (diff) | |
oox: remove Package_generated and Package_tokens
Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8
Diffstat (limited to 'writerfilter/CustomTarget_source.mk')
| -rw-r--r-- | writerfilter/CustomTarget_source.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 903cf4f140d2..2c467edd10f6 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -61,7 +61,7 @@ writerfilter_ALL = \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \ -writerfilter_DEP_ooxml_Namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt +writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt writerfilter_GEN_doctok_ResourceIds_hxx=$(writerfilter_WORK)/doctok/resourceids.hxx writerfilter_GEN_doctok_Resources_cxx=$(writerfilter_WORK)/resources.cxx writerfilter_GEN_doctok_Resources_hxx=$(writerfilter_WORK)/doctok/resources.hxx @@ -187,9 +187,10 @@ $(writerfilter_GEN_ooxml_ResourceIds_hxx) : $(writerfilter_SRC_ooxml_ResourceIds $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@ -$(writerfilter_GEN_ooxml_Token_tmp) : $(OUTDIR)/inc/oox/tokens.txt | $(writerfilter_WORK)/.dir +$(writerfilter_GEN_ooxml_Token_tmp) : $(SRCDIR)/oox/source/token/tokens.txt | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) - sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" < $(OUTDIR)/inc/oox/tokens.txt > $@ + sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" \ + < $(SRCDIR)/oox/source/token/tokens.txt > $@ $(writerfilter_GEN_ooxml_Token_xml) : $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) |