editeng/CustomTarget_generated.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
New commits: commit e1cbf05c9d43452eeaa19a5eb47512249ca05edd Author: Daniel Sikeler <d.sikele...@gmail.com> Date: Wed Nov 12 14:45:11 2014 +0000 rename variables in makefile Change-Id: Ie1a7a8d83cc9c1ae4b6d015b77713f446fdd871e Reviewed-on: https://gerrit.libreoffice.org/12388 Reviewed-by: Matúš Kukan <matus.ku...@collabora.com> Tested-by: Matúš Kukan <matus.ku...@collabora.com> diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk index f3329df..e5e8ce6 100644 --- a/editeng/CustomTarget_generated.mk +++ b/editeng/CustomTarget_generated.mk @@ -9,19 +9,19 @@ $(eval $(call gb_CustomTarget_CustomTarget,editeng/generated)) -SRC := $(SRCDIR)/editeng/source/misc -PL := $(SRCDIR)/solenv/bin/gentoken.pl -INC := $(call gb_CustomTarget_get_workdir,editeng/generated) +editeng_SRC := $(SRCDIR)/editeng/source/misc +editeng_PL := $(SRCDIR)/solenv/bin/gentoken.pl +editeng_INC := $(call gb_CustomTarget_get_workdir,editeng/generated) -$(INC)/tokens.hxx $(INC)/tokens.gperf : $(SRC)/tokens.txt $(PL) - mkdir -p $(INC) - $(PERL) $(PL) $(SRC)/tokens.txt $(INC)/tokens.gperf +$(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PL) + mkdir -p $(editeng_INC) + $(PERL) $(editeng_PL) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf -$(INC)/tokens.cxx : $(INC)/tokens.gperf - $(GPERF) --compare-strncmp --readonly-tables --output-file=$(INC)/tokens.cxx $(INC)/tokens.gperf - sed -i -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(INC)/tokens.cxx - sed -i -e "/^#line/d" $(INC)/tokens.cxx +$(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf + $(GPERF) --compare-strncmp --readonly-tables --output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf + sed -i -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx + sed -i -e "/^#line/d" $(editeng_INC)/tokens.cxx -$(call gb_CustomTarget_get_target,editeng/generated) : $(INC)/tokens.cxx +$(call gb_CustomTarget_get_target,editeng/generated) : $(editeng_INC)/tokens.cxx # vim: set noet sw=4 ts=4:
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits