summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-08 18:48:38 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-08 18:52:15 +0200
commited8f9ec2caa8485691999e5565a79e451e1dcb92 (patch)
tree45f2306641fb006d3dc5e0dfcd7dc37e762e9dfd /oox
parent5589c72b88e502bfca045ae38af16c854afdd401 (diff)
oox: fix dependencies in CustomTarget
This breaks on incremental build after files have been renamed like in 38f5717b1d488b866d55a603eea1260c6203fd69, hope Windows tinderboxes are happy now. Change-Id: I292508c242f7e6da1db3693cf54ba11876ac8997
Diffstat (limited to 'oox')
-rw-r--r--oox/CustomTarget_generated.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index aca38ab6b3a6..92c8bf8196d8 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -26,14 +26,12 @@ $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@
-oox_GenTarget_get_target = $(oox_MISC)/$(1)
-
define oox_GenTarget
-$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc \
- $(if $(3),$(oox_MISC)/$(3)) : $(call oox_GenTarget_get_target,$(1))
+$(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) : \
+ $(oox_GENHEADERPATH)/$(1).hxx
@touch $$@
-$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt \
+$(oox_GENHEADERPATH)/$(1).hxx : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt \
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)