[Libreoffice-commits] core.git: oox/CustomTarget_generated.mk

[Michael Stahl]

 oox/CustomTarget_generated.mk |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit ed8f9ec2caa8485691999e5565a79e451e1dcb92
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 8 18:48:38 2013 +0200

    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

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index aca38ab..92c8bf8 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)