lilypond-1.2.7

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index 6e8a382f62553dc68ae33750f89030f4f331f294..094ec075229ed26d9f61b2f16bf6f7e3db24a0e0 100644 (file)
--- 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='\r' --package=$(topdir) -o $@ $<
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
+       $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r' -o $@ $<
+       $(PYTHON) $(step-bindir)/add-html-footer.py  $@
 
 $(outdir)/%.tex: %.data $(depth)/VERSION
-       $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r' --package=$(topdir) -o $@ --latex $<
+       $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r'  -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 2df6d428285f6761fec27027967fc3663cb0c561..d40a30064f55b50292cdf938c99d760ffde2197f 100644 (file)
--- 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='\r' --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='\r' --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 f2c4dd09c73da4884c638a536117c5cc85faf69e..2afee0f19096fb935b02b435aa6a7b73ff79256f 100644 (file)
--- 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 7dbeadc3f804638bec3d589aa708663760c10e50..93174baed76c57aab6ff7f66c5f98218a567ec6d 100644 (file)
--- 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='\r' -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='\r'  -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 8c90d01de8ae2936c3f29f967cff677d31c7772b..207156e1d7e2463e1dd0e5db0d38b7b1b0bf6971 100644 (file)
--- 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 11b4a35299335c16fabe98790a729b4b760d13c8..5080ace0e4cf62283b54396d889e07563e829e2d 100644 (file)
--- 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