oox/CustomTarget_generated.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit faafdc50a1e00f083c6e0c924a1200a4e5c91401 Author: Miklos Vajna <[email protected]> Date: Mon Mar 17 10:35:14 2014 +0100 oox: try to fix incremental build The problem was that the input of the generated vmlexport-shape-types.cxx got changed, but it was only built when building from scratch. Fix this by depending on the makefile as well. (cherry picked from commit b916fc4840ba67ef30e45ea735408237a3422b56) Signed-off-by: Michael Stahl <[email protected]> Conflicts: oox/CustomTarget_generated.mk Change-Id: Ia2d7f059aae2f5819bb8a1329fefa74c56660607 diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index 14789d6..ba93b0d 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -17,7 +17,8 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token $(oox_MISC)/vmlexport-shape-types.cxx : \ $(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \ $(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \ - $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml + $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml \ + $(SRCDIR)/oox/CustomTarget_generated.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1) mkdir -p $(dir $@) perl $^ > [email protected]_progress 2> [email protected] && mv [email protected]_progress $@ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
