mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: fix dependencies in CustomTarget

Browse Source 
This breaks on incremental build after files have been renamed like in
38f5717b1d, hope Windows tinderboxes are
happy now.

Change-Id: I292508c242f7e6da1db3693cf54ba11876ac8997
This commit is contained in:
Michael Stahl
2013-05-08 18:48:38 +02:00
parent 5589c72b88
commit ed8f9ec2ca
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oox/CustomTarget_generated.mk
View File

@@ -26,14 +26,12 @@ $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@ $(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 define oox_GenTarget
$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc \ $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) : \
$(if $(3),$(oox_MISC)/$(3)) : $(call oox_GenTarget_get_target,$(1)) $(oox_GENHEADERPATH)/$(1).hxx
@touch $$@ @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 $(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH) mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)