lilypond-1.3.141

diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index ebcf4f2fd0eebc5191d182f322139d779215be89..f02cd2c461756f5832d79dc4a5511d2fe41f8476 100644 (file)
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -13,7 +13,7 @@ default: local-doc
 
 #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
+local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html
 
 copy-for-me:
        $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index cfef86420064dd6e8a84af05e85aa648460ad10c..80ab9a654afbbad1f5bec54934742d62f31ddd2a 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -1,14 +1,22 @@
 depth = ../..
 
 
-STEPMAKE_TEMPLATES=documentation tex texinfo yolily-topdoc
+STEPMAKE_TEMPLATES=documentation tex texinfo
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html))
 
+#default: local-doc 
 
 include $(depth)/make/stepmake.make 
 
-local-WWW: $(HTML_FILES)
+copy-to-top:  $(TO_TOP_FILES)
+       $(foreach i, $(TO_TOP_FILES), \
+         cp $(i) $(depth)/ && ) true
+       -cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
+
+###local-WWW: copy-to-top
+
+local-WWW: $(HTML_FILES) copy-to-top
 # we want footers even if website builds (or is built) partly
        $(MAKE) footify
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 54df9c3632b5a637ee6010329735a3bf8eef8910..08a4b139c5f009ec8efee3a497397a8645097d92 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -93,16 +93,18 @@ deep-symlinks:
 endif
 
 
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
+local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+       rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+
+info-dir:
        $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
        $(MAKE) footify
        $(MAKE) deep-footify
 
-#      $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
-#         $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
-#        | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-
-
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
@@ -113,9 +115,6 @@ local-clean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
-backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
-       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
-
 # when cross-compiling, we don't have lilypond
 ifneq ($(CROSS),yes)
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index 8b0a59875936f054fd83da6e7f99e4550192f83f..48136e47d26a79882156861183a1a0546f89ed4b 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -14,6 +14,6 @@ EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES)  \
 OUTCONF_FILES = $(OUTIN_FILES)
 OUT_DIST_FILES = $(OUTIN_FILES)
 
-STEPMAKE_TEMPLATES = yolily-debian
+STEPMAKE_TEMPLATES = debian
 include $(depth)/make/stepmake.make 
 

diff --git a/lily/main.cc b/lily/main.cc
index 50f10161e048f61fdd666de5857dc252ca2cc882..75c9ea84d8be439d37006fc973fec8a1cea7a125 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -114,7 +114,7 @@ static Long_option_init options_static[] = {
   {0, "version", 'v',  _i ("print version number")},
   {0, "verbose", 'V', _i ("verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
-  {_i ("EXPR"), "evaluate", 'e',_i ("evalute  EXPR as Scheme after .scm init is read")},
+  {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
   {0,0,0,0}
 };
 
@@ -328,7 +328,7 @@ main_prog (int, char**)
   all_fonts_global_p = new All_font_metrics (global_path.str ());
 
   init_scheme_code_string += ")";
-  gh_eval_str (init_scheme_code_string.ch_C());
+  gh_eval_str ((char *)init_scheme_code_string.ch_C());
   
   int p=0;
   const char *arg ;

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 5f94a465bd8e4201c6b5e4c16bd3715e9399e08d..83f330c9fd583c1c342b851ad334f625b3256a54 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -7,7 +7,9 @@ export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(
 export TFMFONTS=$(topdir)/mf/out:
 
 export LILYPONDPREFIX:=$(depth)/
+export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)
 
+# guile load path?
 
 the-script-dir=$(wildcard $(script-dir))
 

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 16906c87fe292adb186f363eae1160c2523ad47e..904f2c326862355441b44f479f9e0bf7d5e3558a 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,21 +1,22 @@
 
+include $(stepdir)/www-targets.make
+
+
 .PHONY: download mutopia png ps scores tar
 
 .PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
 .PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
 
+
 all: $(OUT_FILES)
 
 local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
 
-local-web:
-       $(MAKE) conf=www local-WWW
-
 convert-ly: local-convert-ly
        $(LOOP)
 
 local-convert-ly:
-       $(PYTHON) $(CONVERT_LY) -e *ly
+       $(PYTHON) $(CONVERT_LY) --edit --assume-old *ly
 
 tar:
        mkdir -p $(outdir)/$(tarball)
@@ -30,30 +31,6 @@ ps: $(ps_examples)
 scores: $(score_ps)
        $(MAKE) ps_examples="$<" ps
 
-#
-# <NAME> and -book targets only available through ly.make template makefile;
-# too scary to install in LilyPonds make yet.
-#
-#
-
-ifeq (0,1)
-#
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-       psbook $< $<.1
-       pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.1 $@
-       rm -f $<.1
-
-#
-# Catch-all target: type `make foo' to make out/foo.ps,
-# or make `foo-book' to make out/foo-book.ps
-#
-%: $(outdir)/%.ps
-       @echo Making $@ from $<
-endif
-
-
 local-mutopia:
        $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
 
@@ -68,7 +45,9 @@ local-letter-clean:
        rm -f $(outdir)-letter/*
 
 
-local-help:
+local-help: local-mutopia-help
+
+local-mutopia-help:
        @echo -e "\
   <NAME>      update $(outdir)/<NAME>.ps\n\
   <NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
@@ -81,41 +60,3 @@ local-help:
 #
 
 
-
-#
-# mutopia-archive playground
-#
-
-
-# -> mutopia-vars.make
-MUTOPIA_MIRROR = http://www.mutopiaproject.org/ftp
-# ugh: doesn't work
-# mutopia-dir = $(pwd:%/mutopia/%=mutopia)
-mutopia-dir = $(shell pwd | sed 's@.*mutopia@@')
-wget-list = $(mutopia-examples:%=$(mutopia-dir)/%)
-
-local-remove-ly:
-       -mv -f $(wildcard *.ly) $(outdir)
-
-remove-ly: local-remove-ly
-       $(LOOP)
-
-local-download: $(mutopia-examples:%=%.ly)
-       @echo downloading $<
-
-download: local-download
-       $(LOOP)
-
-# -> mutopia-rules.make
-ifeq ($(zipped),)
-%.ly:
-       wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@
-else
-%.zip:
-       wget $(MUTOPIA_MIRROR)/$(mutopia-dir)/$@
-
-%.ly:  %-lys.zip
-       unzip $<
-endif
-
-

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index b09753c60d6fbd76a7bd2b483089fc3b2a224a25..edecfad30bfd62672011db78b6c8d4d3c70fb8da 100644 (file)
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -12,8 +12,6 @@ M4_FILES = $(wildcard *.m4)
 LYM4_FILES = $(wildcard *.lym4)
 EXTRA_DIST_FILES += $(FLY_FILES) $(SLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES)
 
-# WWW.make
-
 ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
 fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples)))
 sly_examples=$(addprefix $(outdir)/, $(addsuffix .sly.txt, $(slexamples)))

diff --git a/stepmake/make/generic-targets.make b/stepmake/make/generic-targets.make
index 16676251236f7fdf5a5a7e925ce4d5cc8635b0d5..134615d18dc0e30d89d284214364c8fb87c9504d 100644 (file)
--- a/stepmake/make/generic-targets.make
+++ b/stepmake/make/generic-targets.make
@@ -1,19 +1,19 @@
 # title           package specific targets
 
-.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-www-doc check-rpm-icons
+.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-web-doc check-rpm-icons
 
-check-html-deps:
-       $(MAKE) -C $(depth)/Documentation html
+#check-html-deps:
+#      $(MAKE) -C $(depth)/Documentation html
 
-check-www-doc:
-       $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
-       $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
+#check-web-doc:
+#      $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
+#      $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
 
 # check-rpm-doc-deps: 
 #      $(MAKE) -C $(depth)/Documentation gifs
 
-check-rpm-icons:
+#check-rpm-icons:
 
-check-make-deps:
-       $(MAKE) -C $(depth)/make
+#check-make-deps:
+#      $(MAKE) -C $(depth)/make
 

diff --git a/stepmake/stepmake/debian-rules.make b/stepmake/stepmake/debian-rules.make
new file mode 100644 (file)
index 0000000..11638b9
--- /dev/null
+++ b/stepmake/stepmake/debian-rules.make
@@ -0,0 +1,7 @@
+$(outdir)/%: %
+       rm -f $@
+       ln $< $@
+
+$(outdir)/%: $(doc-dir)/%.in
+       rm -f $@
+       cat $< | sed 's%^% %' > $@

diff --git a/stepmake/stepmake/debian-targets.make b/stepmake/stepmake/debian-targets.make
new file mode 100644 (file)
index 0000000..c9499e2
--- /dev/null
+++ b/stepmake/stepmake/debian-targets.make
@@ -0,0 +1,7 @@
+
+default: $(OUTCONF_FILES)
+
+$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS))
+
+
+# local-dist: default

diff --git a/stepmake/stepmake/debian-vars.make b/stepmake/stepmake/debian-vars.make
new file mode 100644 (file)
index 0000000..6acddd5
--- /dev/null
+++ b/stepmake/stepmake/debian-vars.make
@@ -0,0 +1,2 @@
+#empty
+

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index c007a914bf5592934410f8c87ae74223572daf95..f1ab42266861dfaa434291365faa9c4f3b5fd198 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -1,12 +1,10 @@
 
 default:
 
+include $(stepdir)/www-targets.make
 
 local-WWW: $(OUTHTML_FILES) footify
 
-local-web:
-       $(MAKE) out=www local-WWW
-
 footify:
        $(footify) $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html))
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 293a4e513dd8dac38edd915e9a1983bc4db25371..57c20901e640a8b8a730c492865847a65f27781e 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -50,43 +50,21 @@ help: generic-help local-help
        @echo -e "\
   all         update everything\n\
   clean       remove all genated stuff in $(outdir)\n\
-  config      rerun configure\n\
-  deb         build Debian package\n\
   default     same as the empty target\n\
-  diff        generate patch: $(depth)/$(outdir)/$(distname).diff.gz\n\
-  .           Options:\n\
-  .             from=0.1.74\n\
-  .             help==\n\
-  .             release==\n\
-  .             to=0.1.74.jcn2\n\
-  dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
-  distclean   cleaner than clean (duh)\n\
-  doc         update all documentation\n\
   exe         update all executables\n\
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
   lib         update all libraries\n\
-  release     roll tarball and generate patch\n\
-  rpm         build RedHat package\n\
-  po          make new translation Portable Object database\n\
-  po-replace  do po-update and replace catalogs with msgmerged versions\n\
-  po-update   update translation Portable Object database\n\
-  tar         same as dist\n\
   TAGS        genarate tagfiles\n\
-  zip         build binary doze distribution\n\
 \n\
 Make may be invoked from any subdirectory\n\
-Note that all commands recurse into SUBSDIRS\n\
+Note that all commands recurse into SUBDIRS;\n\
+prepend \`local-' to do only cwd, eg: local-clean\n\
 "\
 #
 
 local-help:
 
-doc: local-doc
-       $(LOOP)
-
-local-doc:
-
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        mkdir -p $(distdir)/$(localdir)
        $(LN) $(DIST_FILES) $(distdir)/$(localdir)
@@ -154,11 +132,6 @@ installextradoc:
        $(foreach i, $(EXTRA_DOC_FILES),\
                cp -r $(i) $(prefix)/doc/$(package) &&) true
 
-WWW: local-WWW
-       $(LOOP)
-
-local-WWW:
-
 include $(stepdir)/package.make
 
 include $(outdir)/dummy.dep $(DEP_FILES)
@@ -175,8 +148,8 @@ local-check:
 
 # ugh.  ugh ugh ugh
 $(depth)/$(configuration).make: $(depth)/configure
-       @echo "**************************************"
+       @echo "************************************************************"
        @echo "configure changed! You should probably reconfigure manually."
-       @echo "**************************************"
+       @echo "************************************************************"
        (cd $(depth); ./config.status)
        touch $@                # do something for multiple simultaneous configs.

diff --git a/stepmake/stepmake/toplevel-rules.make b/stepmake/stepmake/toplevel-rules.make
index 60a25993d666d904ffceec52506f63898717d97c..ea30561d839798e1ef284fb70adc009fda12db16 100644 (file)
--- a/stepmake/stepmake/toplevel-rules.make
+++ b/stepmake/stepmake/toplevel-rules.make
@@ -1,5 +1 @@
-# -*-Makefile-*-
-# title           Toplevel_rules.make
-
-# empty
-
+#empty

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 2039b624ccb20a6b571e1a8f886c51b672cad134..975b3d2b1e20b61204763d84b18a4733e4047da9 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,6 +1,8 @@
 # -*-Makefile-*-
 # title           Toplevel_targets.make
 
+include $(stepdir)/www-targets.make
+
 local-dist: configure 
 
 # urg!: this gets into every package (ie: yodl)
@@ -20,15 +22,26 @@ aclocal.m4: $(stepmake)/aclocal.m4
        $(MAKE) INFILE=$< OUTFILE=$@ LINECOMMENT=dnl -f $(stepdir)/automatically-generated.sub.make
 endif
 
-local-WWW: #index.html 
 
-index.html: check-top-web NEWS
-##     $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
+$(package-icon):
+       $(MAKE) -C Documentation/pictures icon
+
+
+do-top-doc:
+       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top
+
 
-WWW-clean: local-WWW-clean
-       $(MAKE) out='www' clean
+$(README_TXT_FILES): do-top-doc
 
-local-WWW-clean:
+local-clean:
+
+###check-top-web:
+###    $(MAKE) -C Documentation/topdocs WWW
+#####
+
+####index.html: check-top-web NEWS
+
+local-dist: do-top-doc
 
 dist:
        rm -rf $(distdir)
@@ -41,5 +54,30 @@ dist:
        -ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
        rm -rf $(distdir)/
 
+#
+#
 local-help:
-
+       @echo -e "\
+  config      rerun configure\n\
+  deb         build Debian package\n\
+  diff        generate patch: $(depth)/$(outdir)/$(distname).diff.gz\n\
+  .           Options:\n\
+  .             from=0.1.74\n\
+  .             help==\n\
+  .             release==\n\
+  .             to=0.1.74.jcn2\n\
+  dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
+  distclean   cleaner than clean (duh)\n\
+  doc         update all documentation\n\
+  release     roll tarball and generate patch\n\
+  rpm         build Red Hat package\n\
+  po          make new translation Portable Object database\n\
+  po-replace  do po-update and replace catalogs with msgmerged versions\n\
+  po-update   update translation Portable Object database\n\
+  web         update website in out-www\n\
+  web-clean   clean out-www\n\
+\n\
+Some of these top level targets (diff, dist, release) can be issued\n\
+from anywhere in the source tree.\n\
+"\
+#

diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make
index 9c642cfa2523f34ffa89d455d0fe94fb848a7826..6486853b6c08d911c4a2818994058a9f69f5a574 100644 (file)
--- a/stepmake/stepmake/toplevel-vars.make
+++ b/stepmake/stepmake/toplevel-vars.make
@@ -1,9 +1,9 @@
-# -*-Makefile-*-
-# title           Toplevel_vars.make
 
 # override Generic_vars.make:
-# do not dist ./Makefile (is copied from make/Toplevel.make)
-# 
 DIST_FILES := $(EXTRA_DIST_FILES) 
-#
+
+TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
+
+# urg?
+include $(stepdir)/documentation-vars.make
 

diff --git a/stepmake/stepmake/www-rules.make b/stepmake/stepmake/www-rules.make
new file mode 100644 (file)
index 0000000..5dd8fd0
--- /dev/null
+++ b/stepmake/stepmake/www-rules.make
@@ -0,0 +1 @@
+#empty
\ No newline at end of file

diff --git a/stepmake/stepmake/www-targets.make b/stepmake/stepmake/www-targets.make
new file mode 100644 (file)
index 0000000..98359f8
--- /dev/null
+++ b/stepmake/stepmake/www-targets.make
@@ -0,0 +1,27 @@
+
+local-WWW:
+
+ifneq ($(strip $(depth)),.)
+WWW: local-WWW
+       $(LOOP)
+
+WWW-clean: local-WWW-clean
+       $(LOOP)
+endif
+
+local-web:
+       $(MAKE) out=www local-WWW
+
+web:
+       $(MAKE) out=www WWW
+
+local-WWW-clean:
+       rm -f $(outdir)/*
+
+local-web-clean:
+       $(MAKE) out=www local-WWW-clean
+
+web-clean:
+       $(MAKE) out=www WWW-clean
+
+

diff --git a/stepmake/stepmake/www-vars.make b/stepmake/stepmake/www-vars.make
new file mode 100644 (file)
index 0000000..5dd8fd0
--- /dev/null
+++ b/stepmake/stepmake/www-vars.make
@@ -0,0 +1 @@
+#empty
\ No newline at end of file