From: Jean-Charles Malahieude Date: Fri, 4 Jan 2013 18:07:40 +0000 (+0100) Subject: PO: remove duplicates entries for hh and cc from ALL_PO_SOURCES X-Git-Tag: release/2.17.10-1~27 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=51d4e23ad19c445ca4037a98dee15c838da71c39;p=lilypond.git PO: remove duplicates entries for hh and cc from ALL_PO_SOURCES Introduced with version 1.0.1 : in stepmake/stepmake/C.make ALL_C_SOURCES = h, c, y and l files in stepmake/stepmake/Targets.make ALL_PO_SOURCES = $(ALL_C_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc) hh and cc files having since then been registered through ALL_CC_SOURCES, there is no need to double their entry. Even worse, an "out of tree build" results in a doubled location of parser.yy and lexer.ll (one of them with a full path). --- diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make index c971e513c0..8919dab823 100644 --- a/stepmake/stepmake/po-targets.make +++ b/stepmake/stepmake/po-targets.make @@ -29,7 +29,7 @@ local-po: else po: local-po $(LOOP) -ALL_PO_SOURCES = $(ALL_C_SOURCES) $(ALL_CC_SOURCES) $(PYTHON_SCRIPTS_IN) $(PY_MODULES_IN) $(SCM_FILES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc) +ALL_PO_SOURCES = $(ALL_C_SOURCES) $(ALL_CC_SOURCES) $(PYTHON_SCRIPTS_IN) $(PY_MODULES_IN) $(SCM_FILES) local-po: ifneq ($(strip $(ALL_PO_SOURCES)),) @echo $(ALL_PO_SOURCES)