From: fred Date: Tue, 26 Mar 2002 22:25:45 +0000 (+0000) Subject: lilypond-1.2.7 X-Git-Tag: release/1.5.59~2162 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=863d307378d1cd8d5651c962beeb6c322cef51b2;p=lilypond.git lilypond-1.2.7 --- diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile index 6e8a382f62..094ec07522 100644 --- a/Documentation/bibliography/GNUmakefile +++ b/Documentation/bibliography/GNUmakefile @@ -44,19 +44,18 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) #urg should generalise and move Lilypond -> StepMake # URG. Lilypond specific. Move out. $(outdir)/%.html: %.data $(depth)/VERSION - $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ $< - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@ + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ $< + $(PYTHON) $(step-bindir)/add-html-footer.py $@ $(outdir)/%.tex: %.data $(depth)/VERSION - $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ --latex $< + $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ --latex $< local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) - $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \ + $(PYTHON) $(step-bindir)/ls-latex.py --title 'LaTeX documents about design and implementation of LilyPond' \ $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\ | sed "s!$(outdir)/!!g" > $(outdir)/index.html - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html $(outdir)/%.bib: %.bib ln -f $< $@ diff --git a/Documentation/metadoc/GNUmakefile b/Documentation/metadoc/GNUmakefile index 2df6d42828..d40a30064f 100644 --- a/Documentation/metadoc/GNUmakefile +++ b/Documentation/metadoc/GNUmakefile @@ -44,7 +44,6 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) # URG. Lilypond specific. Move out. $(outdir)/%.html: %.data $(depth)/VERSION $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ $< - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@ $(outdir)/%.tex: %.data $(depth)/VERSION $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' --package=$(topdir) -o $@ --latex $< @@ -52,10 +51,9 @@ $(outdir)/%.tex: %.data $(depth)/VERSION local-WWW-donotdoit: $(HTML_FILES) $(OUTTEX_FILES:.doc=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) ps - $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about design and implementation of LilyPond' \ + $(PYTHON) $(step-bindir)/ls-latex.py --title 'LaTeX documents about design and implementation of LilyPond' \ $(TELY_FILES) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\ | sed "s!$(outdir)/!!g" > $(outdir)/index.html - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html $(outdir)/%.bib: %.bib ln -f $< $@ diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile index f2c4dd09c7..2afee0f190 100644 --- a/Documentation/ntweb/GNUmakefile +++ b/Documentation/ntweb/GNUmakefile @@ -1,6 +1,6 @@ depth = ../.. -STEPMAKE_TEMPLATES=documentation +STEPMAKE_TEMPLATES=documentation texinfo TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) PLAIN_FILES=angels.ly guile.patch @@ -15,9 +15,6 @@ $(outdir)/%.html: %.yo $(sed-version) < $< > $<.out $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<.out rm -f $<.out - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) \ - --index=http://www.cs.ruu.nl/people/hanwen/lilypond/index.html \ - --news=$(depth)/NEWS $@ dist-plain: cp $(PLAIN_FILES) $(outdir) diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile index 7dbeadc3f8..93174baed7 100644 --- a/Documentation/tex/GNUmakefile +++ b/Documentation/tex/GNUmakefile @@ -42,7 +42,6 @@ OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) # URG. Lilypond specific. Move out. $(outdir)/%.html: %.data $(depth)/VERSION $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ $< - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@ $(outdir)/%.latex: %.data $(depth)/VERSION $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ --format=latex $< @@ -55,7 +54,6 @@ local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation about LilyPond' \ $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \ | sed "s!$(outdir)/!!g" > $(outdir)/index.html - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html $(outdir)/%.bib: %.bib ln -f $< $@ diff --git a/make/generic-vars.make b/make/generic-vars.make index 8c90d01de8..207156e1d7 100644 --- a/make/generic-vars.make +++ b/make/generic-vars.make @@ -59,3 +59,5 @@ INSTALL_DIST_FILES = \ INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES)) + + diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 11b4a35299..5080ace0e4 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -5,7 +5,6 @@ all: $(OUT_FILES) local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples) (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples)) - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html echo $^ > $(depth)/wwwlist convert-mudela: local-convert-mudela