X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fmisc%2FGNUmakefile;h=bb3beb4998c5b63018cc8d6bd322ef457452b74d;hb=f311269812e10b3a764b66199d00d1e2d0b78ae6;hp=f02cd2c461756f5832d79dc4a5511d2fe41f8476;hpb=79d916d1fa2a921732f7432e87b25058693be370;p=lilypond.git diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index f02cd2c461..bb3beb4998 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -4,16 +4,17 @@ NAME = documentation STEPMAKE_TEMPLATES=documentation texinfo -TEXTS =AIMS $(wildcard CHANGES-*[0-9]) $(wildcard ANNOUNCE-*[0-9]) $(wildcard NEWS-*[0-9]) interview +TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9]) EXTRA_DIST_FILES = $(TEXTS) -include $(depth)/make/stepmake.make +include $(depth)/make/stepmake.make default: local-doc -#urg default local-WWW target uses footify before its time; +#urg default local-WWW target uses footify before its time; # must add footify with txt-to-html target -local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html +OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) +##local-WWW-2: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html copy-for-me: $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true @@ -22,9 +23,5 @@ $(outdir)/%.txt: % cp $< $@ txt-to-html: - $(foreach a, $(TEXTS),\ - echo "" > $(outdir)/$(a).html;\ - cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\ - echo "" >> $(outdir)/$(a).html\ - && ) true + $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES) $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(TEXTS)))