diff options
| -rw-r--r-- | Documentation/GNUmakefile (renamed from Documentation/Makefile) | 8 | ||||
| -rw-r--r-- | Documentation/man/GNUmakefile (renamed from Documentation/man/Makefile) | 6 | ||||
| -rw-r--r-- | Documentation/ntweb/GNUmakefile | 12 | ||||
| -rw-r--r-- | Documentation/ntweb/index.yo | 127 | ||||
| -rw-r--r-- | Documentation/pictures/GNUmakefile (renamed from Documentation/pictures/Makefile) | 4 | ||||
| -rw-r--r-- | Documentation/tex/GNUmakefile (renamed from Documentation/tex/Makefile) | 6 | ||||
| -rw-r--r-- | Documentation/topdocs/GNUmakefile | 9 | ||||
| -rw-r--r-- | Documentation/topdocs/README.yo | 6 | ||||
| -rw-r--r-- | Documentation/topdocs/index.yo | 1 | ||||
| -rw-r--r-- | NEWS | 65 | ||||
| -rw-r--r-- | README.txt | 7 | ||||
| -rw-r--r-- | TODO | 9 | ||||
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | buildscripts/GNUmakefile | 12 | ||||
| -rw-r--r-- | buildscripts/Makefile | 12 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/GNUmakefile (renamed from debian/Makefile) | 18 | ||||
| -rw-r--r-- | flower/GNUmakefile (renamed from flower/Makefile) | 7 | ||||
| -rw-r--r-- | flower/include/GNUmakefile | 9 | ||||
| -rw-r--r-- | flower/include/Makefile | 9 | ||||
| -rw-r--r-- | init/GNUmakefile (renamed from init/Makefile) | 6 | ||||
| -rw-r--r-- | init/property.ly | 4 | ||||
| -rw-r--r-- | input/GNUmakefile (renamed from input/Makefile) | 4 | ||||
| -rw-r--r-- | input/bugs/GNUmakefile | 8 | ||||
| -rw-r--r-- | input/bugs/Makefile | 8 | ||||
| -rw-r--r-- | input/test/GNUmakefile (renamed from input/test/Makefile) | 4 | ||||
| -rw-r--r-- | intl/GNUmakefile (renamed from intl/Makefile) | 8 | ||||
| -rw-r--r-- | intl/Makefile.in.dist | 2 | ||||
| -rw-r--r-- | lib/GNUmakefile (renamed from lib/Makefile) | 4 | ||||
| -rw-r--r-- | lib/include/GNUmakefile | 9 | ||||
| -rw-r--r-- | lib/include/Makefile | 9 | ||||
| -rw-r--r-- | lily/GNUmakefile (renamed from lily/Makefile) | 7 | ||||
| -rw-r--r-- | lily/VERSION | 4 | ||||
| -rw-r--r-- | lily/include/GNUmakefile | 8 | ||||
| -rw-r--r-- | lily/include/Makefile | 8 | ||||
| -rw-r--r-- | lily/include/text-def.hh | 2 | ||||
| -rw-r--r-- | lily/lyric-engraver.cc | 5 | ||||
| -rw-r--r-- | lily/parser.yy | 2 | ||||
| -rw-r--r-- | lily/script-engraver.cc | 5 | ||||
| -rw-r--r-- | lily/text-def.cc | 25 | ||||
| -rw-r--r-- | make/Docrules.make | 3 | ||||
| -rw-r--r-- | make/GNUmakefile (renamed from stepmake/make/Makefile) | 4 | ||||
| -rw-r--r-- | make/Makefile | 13 | ||||
| -rw-r--r-- | make/STATE-VECTOR | 67 | ||||
| -rw-r--r-- | make/Stepmake.make | 45 | ||||
| -rw-r--r-- | make/Targets.make | 8 | ||||
| -rw-r--r-- | make/docrules.make | 3 | ||||
| -rw-r--r-- | make/generic-rules.make (renamed from make/Rules.make) | 10 | ||||
| -rw-r--r-- | make/generic-targets.make | 2 | ||||
| -rw-r--r-- | make/generic-vars.make (renamed from make/Variables.make) | 2 | ||||
| -rw-r--r-- | make/lilypond-rules.make (renamed from make/Lilypond_rules.make) | 0 | ||||
| -rw-r--r-- | make/lilypond-targets.make (renamed from make/Lilypond_targets.make) | 0 | ||||
| -rw-r--r-- | make/lilypond-vars.make (renamed from make/Lilypond_vars.make) | 0 | ||||
| -rw-r--r-- | make/mudela-rules.make (renamed from make/Mudela_rules.make) | 0 | ||||
| -rw-r--r-- | make/mudela-targets.make (renamed from stepmake/stepmake/C++_files.make) | 0 | ||||
| -rw-r--r-- | make/mudela-vars.make | 1 | ||||
| -rw-r--r-- | make/mutopia-rules.make (renamed from make/Mutopia_rules.make) | 0 | ||||
| -rw-r--r-- | make/mutopia-targets.make (renamed from make/Mutopia_targets.make) | 0 | ||||
| -rw-r--r-- | make/mutopia-vars.make (renamed from make/Mutopia_vars.make) | 2 | ||||
| -rw-r--r-- | make/mutopia.make (renamed from make/Mutopia.make) | 0 | ||||
| -rw-r--r-- | make/out/lelievijver.lsm | 17 | ||||
| -rw-r--r-- | make/out/lilypond.lsm | 8 | ||||
| -rw-r--r-- | make/out/lilypond.spec | 4 | ||||
| -rw-r--r-- | make/stepmake.make | 41 | ||||
| -rw-r--r-- | make/substitute.make (renamed from make/Substitute.make) | 4 | ||||
| -rw-r--r-- | make/toplevel-version.make (renamed from make/Toplevel_version.make) | 0 | ||||
| -rw-r--r-- | make/toplevel.make.in (renamed from make/Toplevel.make.in) | 25 | ||||
| -rw-r--r-- | mf/GNUmakefile (renamed from mf/Makefile) | 12 | ||||
| -rw-r--r-- | mf/feta-params.mf | 3 | ||||
| -rw-r--r-- | mi2mu/GNUmakefile (renamed from mi2mu/Makefile) | 4 | ||||
| -rw-r--r-- | mi2mu/include/GNUmakefile | 6 | ||||
| -rw-r--r-- | mi2mu/include/Makefile | 6 | ||||
| -rw-r--r-- | mutopia/Coriolan/GNUmakefile (renamed from mutopia/Coriolan/Makefile) | 4 | ||||
| -rw-r--r-- | mutopia/GNUmakefile (renamed from mutopia/Makefile) | 5 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/GNUmakefile (renamed from mutopia/J.S.Bach/Makefile) | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Petites-Preludes/GNUmakefile (renamed from mutopia/J.S.Bach/Petites-Preludes/Makefile) | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/Makefile) | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly) | 17 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly | 3 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly) | 17 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly | 3 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly) | 5 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 3 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly) | 34 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly | 8 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly) | 17 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly | 3 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly) | 17 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly | 3 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly | 4 | ||||
| -rw-r--r-- | mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly (renamed from mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly) | 2 | ||||
| -rw-r--r-- | mutopia/W.A.Mozart/GNUmakefile | 10 | ||||
| -rw-r--r-- | mutopia/W.A.Mozart/Makefile | 10 | ||||
| -rw-r--r-- | po/GNUmakefile (renamed from po/Makefile) | 4 | ||||
| -rw-r--r-- | scripts/GNUmakefile | 12 | ||||
| -rw-r--r-- | scripts/Makefile | 12 | ||||
| -rw-r--r-- | scripts/ly2dvi.sh | 39 | ||||
| -rw-r--r-- | scripts/ly2dvi32.py | 17 | ||||
| -rw-r--r-- | scripts/mudela-book.py | 3 | ||||
| -rw-r--r-- | stepmake/Documentation/GNUmakefile (renamed from stepmake/Documentation/Makefile) | 4 | ||||
| -rw-r--r-- | stepmake/Documentation/topdocs/GNUmakefile | 15 | ||||
| -rw-r--r-- | stepmake/Documentation/topdocs/Makefile | 34 | ||||
| -rw-r--r-- | stepmake/NEWS | 6 | ||||
| -rw-r--r-- | stepmake/VERSION | 2 | ||||
| -rw-r--r-- | stepmake/aclocal.m4 | 4 | ||||
| -rw-r--r-- | stepmake/bin/GNUmakefile (renamed from stepmake/bin/Makefile) | 4 | ||||
| -rwxr-xr-x | stepmake/configure | 2 | ||||
| -rw-r--r-- | stepmake/make/GNUmakefile | 11 | ||||
| -rw-r--r-- | stepmake/make/STATE-VECTOR | 19 | ||||
| -rw-r--r-- | stepmake/make/Stepmake.make | 36 | ||||
| -rw-r--r-- | stepmake/make/User.make | 15 | ||||
| -rw-r--r-- | stepmake/make/generic-rules.make (renamed from stepmake/make/Rules.make) | 4 | ||||
| -rw-r--r-- | stepmake/make/generic-targets.make (renamed from stepmake/make/Targets.make) | 2 | ||||
| -rw-r--r-- | stepmake/make/generic-vars.make (renamed from stepmake/make/Variables.make) | 0 | ||||
| -rw-r--r-- | stepmake/make/out/stepmake.lsm | 8 | ||||
| -rw-r--r-- | stepmake/make/out/stepmake.spec | 4 | ||||
| -rw-r--r-- | stepmake/make/stepmake.make | 39 | ||||
| -rw-r--r-- | stepmake/make/substitute.make (renamed from stepmake/make/Substitute.make) | 1 | ||||
| -rw-r--r-- | stepmake/make/toplevel-version.make (renamed from stepmake/make/Toplevel_version.make) | 3 | ||||
| -rw-r--r-- | stepmake/make/toplevel.make.in (renamed from stepmake/make/Toplevel.make.in) | 17 | ||||
| -rw-r--r-- | stepmake/make/user.make (renamed from make/User.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/C++.make | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/C.make | 6 | ||||
| -rw-r--r-- | stepmake/stepmake/C_vars.make | 22 | ||||
| -rw-r--r-- | stepmake/stepmake/Executable.make | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/GNUmakefile | 18 | ||||
| -rw-r--r-- | stepmake/stepmake/Include.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/Install_outfiles.sub.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/Library.make | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/Library_rules.make | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/Makedir.shared.make | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/Makefile | 25 | ||||
| -rw-r--r-- | stepmake/stepmake/Metafont_targets.make | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/Rules.make | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/STATE-VECTOR | 19 | ||||
| -rw-r--r-- | stepmake/stepmake/Targets.make | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/Variables.make | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/c++-files.make | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/c++-rules.make (renamed from stepmake/stepmake/C++_rules.make) | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/c++-targets.make | 4 | ||||
| -rw-r--r-- | stepmake/stepmake/c++-vars.make (renamed from stepmake/stepmake/C++_vars.make) | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/c-rules.make (renamed from stepmake/stepmake/C_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/c-targets.make | 7 | ||||
| -rw-r--r-- | stepmake/stepmake/c-vars.make | 26 | ||||
| -rw-r--r-- | stepmake/stepmake/documentation-rules.make (renamed from stepmake/stepmake/Documentation_rules.make) | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/documentation-targets.make (renamed from stepmake/stepmake/Documentation_targets.make) | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/documentation-vars.make (renamed from stepmake/stepmake/Documentation_vars.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/documentation.shared.make (renamed from stepmake/stepmake/Documentation.shared.make) | 6 | ||||
| -rw-r--r-- | stepmake/stepmake/executable-rules.make (renamed from stepmake/stepmake/C++_targets.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/executable-targets.make (renamed from stepmake/stepmake/Executable_targets.make) | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/executable-vars.make (renamed from stepmake/stepmake/Executable_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/files.make (renamed from stepmake/stepmake/Files.make) | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/generic-rules.make (renamed from stepmake/stepmake/Generic_rules.make) | 11 | ||||
| -rw-r--r-- | stepmake/stepmake/generic-targets.make (renamed from stepmake/stepmake/Generic_targets.make) | 34 | ||||
| -rw-r--r-- | stepmake/stepmake/generic-vars.make (renamed from stepmake/stepmake/Generic_vars.make) | 23 | ||||
| -rw-r--r-- | stepmake/stepmake/include.make | 6 | ||||
| -rw-r--r-- | stepmake/stepmake/install-outfiles.make (renamed from stepmake/stepmake/Install_outfiles.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/install-outfiles.sub.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/installfiles.make (renamed from stepmake/stepmake/Installfiles.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/intlrules.make (renamed from stepmake/stepmake/Intlrules.make) | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/library-rules.make (renamed from stepmake/stepmake/Executable_vars.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/library-targets.make (renamed from stepmake/stepmake/Library_targets.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/library-vars.make (renamed from stepmake/stepmake/Library_vars.make) | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/makedir-rules.make (renamed from stepmake/stepmake/C_targets.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/makedir-targets.make (renamed from stepmake/stepmake/Makedir_targets.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/makedir-vars.make (renamed from stepmake/stepmake/Makedir_vars.make) | 9 | ||||
| -rw-r--r-- | stepmake/stepmake/manual.make (renamed from stepmake/stepmake/Manual.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/metafont-rules.make (renamed from stepmake/stepmake/Metafont_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/metafont-targets.make (renamed from stepmake/stepmake/Makedir_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/metafont-vars.make (renamed from stepmake/stepmake/Metafont_vars.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/package.make (renamed from stepmake/stepmake/Package.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/po-rules.make (renamed from stepmake/stepmake/Po_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/po-targets.make (renamed from stepmake/stepmake/Po.make) | 1 | ||||
| -rw-r--r-- | stepmake/stepmake/po-vars.make | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/pod-rules.make (renamed from stepmake/stepmake/Pod_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/script-rules.make (renamed from stepmake/stepmake/Script_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/script-targets.make (renamed from stepmake/stepmake/Script_targets.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/script-vars.make (renamed from stepmake/stepmake/Script_vars.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/substitute-rules.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/substitute-targets.make | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/substitute-vars.make (renamed from stepmake/stepmake/Substitute.make) | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/template.make (renamed from stepmake/stepmake/Template.make) | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/texinfo-rules.make (renamed from stepmake/stepmake/Texinfo_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/toplevel-rules.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/toplevel-targets.make (renamed from stepmake/stepmake/Toplevel.make) | 30 | ||||
| -rw-r--r-- | stepmake/stepmake/toplevel-vars.make | 9 | ||||
| -rw-r--r-- | stepmake/stepmake/yodl-rules.make (renamed from stepmake/stepmake/Yodl_rules.make) | 0 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-debian-rules.make | 3 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-debian-targets.make | 16 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-debian-vars.make | 4 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-topdoc-rules.make | 4 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-topdoc-targets.make (renamed from Documentation/topdocs/Makefile) | 17 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-topdoc-vars.make | 6 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-toplevel-rules.make | 4 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-toplevel-targets.make | 27 | ||||
| -rw-r--r-- | stepmake/stepmake/yolily-toplevel-vars.make | 5 | ||||
| -rw-r--r-- | test/GNUmakefile (renamed from test/Makefile) | 4 | ||||
| -rw-r--r-- | tex/GNUmakefile (renamed from tex/Makefile) | 4 |
205 files changed, 871 insertions, 835 deletions
diff --git a/Documentation/Makefile b/Documentation/GNUmakefile index 25cf1d4f76..361a15f4a7 100644 --- a/Documentation/Makefile +++ b/Documentation/GNUmakefile @@ -2,9 +2,9 @@ depth = .. -NAME = Documentation -SUBDIRS=man tex pictures topdocs -MAKEFILES=Documentation +NAME = documentation +SUBDIRS=man tex pictures topdocs ntweb +STEPMAKE_TEMPLATES=documentation README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1 EXTRA_DIST_FILES = gnu-music-history TODO @@ -12,7 +12,7 @@ EXTRA_DIST_FILES = gnu-music-history TODO BLURBS=BLURB COPERTINA FLAPTEKST OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make default: do-doc diff --git a/Documentation/man/Makefile b/Documentation/man/GNUmakefile index 498473b194..efac06ae88 100644 --- a/Documentation/man/Makefile +++ b/Documentation/man/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. -MAKEFILES=Documentation +STEPMAKE_TEMPLATES=documentation SECTION=1 MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(TEXINFO_FILES) .texinfo))) MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES) .yo))) @@ -11,7 +11,7 @@ OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_F OUT_DIST_FILES += $(MANGROFF) -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make default: $(MANGROFF) @@ -22,7 +22,7 @@ texinfo: $(OUTTEXINFO_FILES) INSTALLATION_OUT_FILES=$(MANGROFF) INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION) -include $(stepdir)/Install_outfiles.make +include $(stepdir)/install-outfiles.make local-WWW: $(MANGROFF:.1=.html) $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'Manual pages for LilyPond' $(YO_FILES) \ diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile new file mode 100644 index 0000000000..709c7875f8 --- /dev/null +++ b/Documentation/ntweb/GNUmakefile @@ -0,0 +1,12 @@ +depth = ../.. + +STEPMAKE_TEMPLATES=documentation +TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) + + +include $(depth)/make/stepmake.make + +default: do-doc + +local-WWW: + diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo new file mode 100644 index 0000000000..407e3d5497 --- /dev/null +++ b/Documentation/ntweb/index.yo @@ -0,0 +1,127 @@ +mailto(daboys@bga.com) +article(LilyPond Windows NT 4.0 Distribution)(nemail(Jeffrey B. Reed)(daboys@bga.com))(label(contents)) +sect(Windows NT Distribution) + +subsect(Introduction) label(introduction) + +This web page is dedicated to the distrubution of LilyPond for Windows +NT 4.0. This package is covered under the GNU General Public License +and all of the source and documentation are available on the official +url(LilyPond +Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html). + +LilyPond is the GNU Project music typesetter. This program can print +beautiful sheet music from a music definition file. It can also play +mechanical performances to a MIDI file. Features include multiple +staffs, meters, clefs, keys, lyrics, versatile input language, +cadenzas, beams, slurs, triplets, formatting scores, part +extraction. It includes a nice font of musical symbols. + +link(Back to top)(contents) +clearpage() + + +subsect(NEWS) label(news) + +Version 1.0.3 is available + +link(Back to top)(contents) +clearpage() + + +subsect(Required packages) label(packages) + +LilyPond uses the code(TeX) package as its rendering engine. code(TeX) +represents the state-of-the-art in computer typesetting. It is used to +generate documentation, article, and book quality output. It is an +assume tool to have in your toolbox. + +LilyPond uses a code(Python) script named code(ly2dvi) to render a +professional quality music score. code(Python) is an interpreted, +interactive, object-oriented programming language. It is often +compared to code(Tcl), code(Perl), code(Scheme) or code(Java). + +itemize( + it()url(code(MiKTeX))(http://www.snafu.de/~cschenk/miktex/) + it()url(code(Python))(http://www.python.org) +) + +link(Back to top)(contents) +clearpage() + + +subsect(Download) label(download) + +itemize( + it()lurl(lilypond-1.0.3.zip) +) + +link(Back to top)(contents) +clearpage() + + +subsect(Installation) label(installation) + +itemize( + it()link(Download)(download) the distribution. + it()unzip + it()Set your path variable for lilypond and TeX + description( + dit(batch file) + In a batch file you can add the following entry: nl() + bf(set path=%path%em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin) + dit(Windows Environment) + In the Windows environment you can select + properties menu of the My Computer icon. Click on + the environment tag and add the following to the user + variables path entry. nl() + bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin) + ) nl() + it() The first installation of LilyPond also requires these + additional steps: + description( + dit(LaTeX geometry package) + itemize( + it()url(download)(ftp://ctan.tug.org/tex-archive/macros/latex/contrib/supported/geometry.zip) the zip file to code(\Temp). + it()Extract the zip file into the LaTeX package area of + code(MiKTeX). This will be bf(em(MiKTeX-dir)\tex\latex) + it()From a Command Prompt change directory into geometry + directory that was just extracted. + it()In the geometry directory type bf(latex geometry.ins) + ) nl() + dit(Miscellaneous fonts) + itemize( + it()In your favorite editor create a file named + code(cmbx14.mf). Add the following lines: nl() + bf(design_size=14.4; ) nl() + bf(input b-cmbx;) + it()From a Command Prompt copy cmbx14.mf to the public font + area of MiKTeX: nl() + bf(copy cmbx14.mf em(MiKTeX-dir)\fonts\source\public\cm\base) + ) + ) nl() + it()See the link(Running)(running) instructions below +) + +link(Back to top)(contents) +clearpage() + + +subsect(Running LilyPond) label(running) +link(Back to top)(contents) +clearpage() + +subsect(LilyPond resources) label(resources) + +itemize( + it()url(LilyPond Homepage) + (http://www.cs.ruu.nl/people/hanwen/lilypond/index.html) + it()url(LilyPond Ftp Site)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/) + it()url(gnu-music-discuss mail archive) + (http://jab.org/mail/gnu-music-discuss@gnu.org/) + it()Please feel free to mail us at url(gnu-music-discuss) + (mailto:gnu-music-discuss@gnu.org) +) + +link(Back to top)(contents) +clearpage() diff --git a/Documentation/pictures/Makefile b/Documentation/pictures/GNUmakefile index e1826fa4b0..a4fceddda3 100644 --- a/Documentation/pictures/Makefile +++ b/Documentation/pictures/GNUmakefile @@ -1,12 +1,12 @@ depth = ../.. -MAKEFILES=Documentation +STEPMAKE_TEMPLATES=documentation XPM_FILES=$(wildcard *.xpm) OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif)) EXTRA_DIST_FILES= $(XPM_FILES) -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make gifs: $(OUTGIF_FILES) diff --git a/Documentation/tex/Makefile b/Documentation/tex/GNUmakefile index 4cc34a44a4..07b68a59f8 100644 --- a/Documentation/tex/Makefile +++ b/Documentation/tex/GNUmakefile @@ -13,11 +13,11 @@ EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) PS_FILES = $(DVI_FILES:.dvi=.ps) -MAKEFILES=Documentation -LOCALMAKEFILES=Lilypond +STEPMAKE_TEMPLATES=documentation +LOCALSTEPMAKE_TEMPLATES=lilypond mudela -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make dvi: $(DVI_FILES) diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile new file mode 100644 index 0000000000..db918cafb4 --- /dev/null +++ b/Documentation/topdocs/GNUmakefile @@ -0,0 +1,9 @@ +depth = ../.. + +BLURBS=BLURB COPERTINA FLAPTEKST + +STEPMAKE_TEMPLATES=documentation yolily-topdoc +LOCALSTEPMAKE_TEMPLATES=lilypond + +include $(depth)/make/stepmake.make + diff --git a/Documentation/topdocs/README.yo b/Documentation/topdocs/README.yo index 564d9ff917..972df8af78 100644 --- a/Documentation/topdocs/README.yo +++ b/Documentation/topdocs/README.yo @@ -17,6 +17,12 @@ if you have downloaded a version, then this is version is *not* meant for producing nice output (but to keep your patchsets up to date). It might not even compile. +The same goes for a version with a 4th version number, eg + + 1.2.3.mypatch2 + +It will be safer if you download 1.2.3 or wait for 1.2.4. + sect(REQUIREMENTS) diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo index 28f5ea8ee3..0e43156068 100644 --- a/Documentation/topdocs/index.yo +++ b/Documentation/topdocs/index.yo @@ -43,6 +43,7 @@ nsect(Sites) description( dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site. dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site. +dit(lurl(http://www.realtime.net/~daboys/lilypond/))Jeff's Windows NT Distribution site. ) nsubsubsect(Mirrors) @@ -1,23 +1,55 @@ +pl 4 +pl 3.mb2 + - Changed text script alignment: center -> left + - TeX commands counts as one character when calculating + the length of a Text_def + +pl 3.jbr2 + - Documentation/topdocs/index.yo: Added link to NT dist page + - Documentation/ntweb/: Added Makefile and index.yo to build the + NT dist page + +pl 3.hwn1 + - stepmake hacking + +pl 3.uu1 + - stepmake MAKEFILES -> STEPMAKE_TEMPLATES + - count \texcommands in tex string + + pl 3.jcn1 - - bf: website: empty toplevel readme's - - bf: xs4all (again?) - - can't administer ftp site now: put patch into website + - bf: website: empty toplevel readme's + - bf: xs4all (again?) + - can't administer ftp site now: put patch into website + + +pl 3.jbr1 + - stepmake/stepmake/Executable_targets: UNIX cross-compile doesn't + work with $(DOTEXE) on source of install command. + - stepmake/Generic_targets: creating multiple dirs with mkdir + requires -p option + - scripts/ly2dvi32.py: General and Winnt specific fixes + + +********* +pl 3 pl 2.uu1 - - solaris 2.6 compile/make website fixes. - - rm'd WWW.make - - stepmake .43 - - pcnov095.win.tue.nl -> ftp.cs.uu.nl - + - solaris 2.6 compile/make website fixes. + - rm'd WWW.make + - stepmake .43 + - pcnov095.win.tue.nl -> ftp.cs.uu.nl + pl 2.hwn1 - - mi2mu naming of track output - - bf: do key restore sign only once - - ly2dvi32 preliminary version (JBR) - -********* -pl 2 + - mi2mu naming of track output + - bf: do key restore sign only once + - ly2dvi32 preliminary version (JBR) - bf index.html link - bf mudela-book.py + + +********** +pl 2 - scalar compile stuff - bf install directory - YODL note @@ -28,11 +60,6 @@ pl 2 - dist AFMs and manpages - split up mudela.yo in glossary.yo, tutorial.yo and refman.yo -pl 1.jcn2 - - renamed -alto -> viola - - bf: avant-gardish six preludes - - bf: ly2dvi warnings - pl 1.jcn1 - www.digicash.com www.xs4all.nl - fake msgfmt diff --git a/README.txt b/README.txt index daeee83662..da3c54dfaa 100644 --- a/README.txt +++ b/README.txt @@ -16,6 +16,11 @@ if you have downloaded a version, then this is version is *not* meant for producing nice output (but to keep your patchsets up to date). It might not even compile. +The same goes for a version with a 4th version number, eg + + 1.2.3.mypatch2 + +It will be safer if you download 1.2.3 or wait for 1.2.4. 2: REQUIREMENTS @@ -61,7 +66,7 @@ and not to us personally. See Documentation/links.yo for more info. If you have received this file as part of a DOS/Window32 distribution (lilypond-*.zip), then it is advisable to also download the source package, since it might contain more documentation -ftp://pcnov095.win.tue.nl/pub/lilypond/ +ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/ If you decide to build LilyPond from source, please read the INSTALL.txt document first, especially the Windows NT/95 section. @@ -7,6 +7,13 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr/urg + * add ex-dimension to feta-params. + + + * strip EXEs before installing + + * text continuationss + * fix plain tex footer line. * portable libs for flowerlib/lilylib @@ -23,8 +30,6 @@ grep for TODO and ugh/ugr/urg * make separate translation property list. - * key undo. - * make GNU style webpages. * There seems to be an install error in lilypond-1.0.0. Most of the @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=3 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=4 +MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/aclocal.m4 b/aclocal.m4 index f7e18136b6..660b3aca0a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -130,7 +130,7 @@ AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) rm -f Makefile - cp make/Toplevel.make.in ./Makefile + cp make/toplevel.make.in ./Makefile chmod 444 Makefile ]) @@ -143,7 +143,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs) + AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs) fi ]) diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile new file mode 100644 index 0000000000..3a24a75973 --- /dev/null +++ b/buildscripts/GNUmakefile @@ -0,0 +1,12 @@ +# bin/Makefile + +depth = .. +STEPMAKE_TEMPLATES=script + +include $(depth)/make/stepmake.make + + + + + + diff --git a/buildscripts/Makefile b/buildscripts/Makefile deleted file mode 100644 index 11751d2f22..0000000000 --- a/buildscripts/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# bin/Makefile - -depth = .. -MAKEFILES=Script - -include $(depth)/make/Stepmake.make - - - - - - @@ -1427,7 +1427,7 @@ fi true else - echo "configure: warning: can't find g++ 2.7" 1>&2 + echo "configure: warning: can\'t find g++ 2.7" 1>&2 warn_b=yes fi @@ -2626,7 +2626,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.h:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -2824,7 +2824,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <<EOF - CONFIG_HEADERS="$CONFIGFILE.hh:config.hh.in" + CONFIG_HEADERS="$CONFIGFILE.h:config.hh.in" EOF cat >> $CONFIG_STATUS <<\EOF fi @@ -3016,7 +3016,7 @@ fi rm -f Makefile - cp make/Toplevel.make.in ./Makefile + cp make/toplevel.make.in ./Makefile chmod 444 Makefile diff --git a/configure.in b/configure.in index c77794dc88..ca80308b7d 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. # Bootstrap the init proces. List a file identifies your package. AC_INIT(make/lilypond.lsm.in) -AC_CONFIG_HEADER($CONFIGFILE.hh:config.hh.in) +AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in) # Bootstrap StepMake configure AC_STEPMAKE_INIT diff --git a/debian/Makefile b/debian/GNUmakefile index a72baf011d..6aac4c8221 100644 --- a/debian/Makefile +++ b/debian/GNUmakefile @@ -13,20 +13,6 @@ CONF_FILES=changelog copyright postinst postrm rules watch OUTCONF_FILES=$(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) OUT_DIST_FILES = $(OUTIN_FILES) -include $(depth)/make/Stepmake.make +STEPMAKE_TEMPLATES = yolily-debian +include $(depth)/make/stepmake.make - -default: $(OUTCONF_FILES) - - -$(outdir)/%: % - rm -f $@ - ln $< $@ - -$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS)) - -$(outdir)/%: $(doc-dir)/%.in - rm -f $@ - cat $< | sed 's%^% %' > $@ - -localdist: default diff --git a/flower/Makefile b/flower/GNUmakefile index 3d71e4e3ef..da46790c0b 100644 --- a/flower/Makefile +++ b/flower/GNUmakefile @@ -12,9 +12,12 @@ SUBDIRS = include SCRIPTS = README_FILES = NEWS-1.0 NEWS-1.1.46 README TODO EXTRA_DIST_FILES= VERSION $(README_FILES) $(SCRIPTS) -MAKEFILES=Library C++ +STEPMAKE_TEMPLATES=library c++ -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make + +foo: + echo $(DIST_FILES) $(O_FILES) $(OBJECT_FILES) diff --git a/flower/include/GNUmakefile b/flower/include/GNUmakefile new file mode 100644 index 0000000000..1d726fc78a --- /dev/null +++ b/flower/include/GNUmakefile @@ -0,0 +1,9 @@ +# flower/lib/include/Makefile + +depth = ../.. + +STEPMAKE_TEMPLATES=c++ + +include $(depth)/make/stepmake.make + + diff --git a/flower/include/Makefile b/flower/include/Makefile deleted file mode 100644 index 8e6af341b3..0000000000 --- a/flower/include/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# flower/lib/include/Makefile - -depth = ../.. - -MAKEFILES=C++ - -include $(depth)/make/Stepmake.make - - diff --git a/init/Makefile b/init/GNUmakefile index 396cea26a9..00000cc6c6 100644 --- a/init/Makefile +++ b/init/GNUmakefile @@ -8,10 +8,10 @@ INI_FILES = $(FLY_FILES) $(LY_FILES) INSTALLATION_DIR=$(datadir) INSTALLATION_FILES=$(INI_FILES) -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make -include $(stepdir)/Installfiles.make +include $(stepdir)/installfiles.make diff --git a/init/property.ly b/init/property.ly index 75d8f10669..a53eccbf6e 100644 --- a/init/property.ly +++ b/init/property.ly @@ -29,6 +29,10 @@ slurydirection -1 force stem down \slurdown slurydirection 0 stem direction free \slurboth slurydirection 1 force stem up \slurup +textalignment -1 left alignment of text +textalignment 0 center alignment of text +textalignment 1 right alignment of text + [Score?] beamslopedamping 0 no damping \beamslopeproportional beamslopedamping 1 damping1) \beamslopedamped diff --git a/input/Makefile b/input/GNUmakefile index 90fade98c1..ad59365a5b 100644 --- a/input/Makefile +++ b/input/GNUmakefile @@ -7,10 +7,10 @@ SUBDIRS=test bugs examples=example-3 twinkle-pop praeludium-fuga-E twinkle flexamples=example-1 example-2 -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make local-check: $(addsuffix .dvi, $(addprefix $(outdir)/, $(examples))) diff --git a/input/bugs/GNUmakefile b/input/bugs/GNUmakefile new file mode 100644 index 0000000000..659a10c8d0 --- /dev/null +++ b/input/bugs/GNUmakefile @@ -0,0 +1,8 @@ +# input/bugs/Makefile + +depth = ../.. + +LOCALSTEPMAKE_TEMPLATES=mutopia +include $(depth)/make/stepmake.make + + diff --git a/input/bugs/Makefile b/input/bugs/Makefile deleted file mode 100644 index b6d250531e..0000000000 --- a/input/bugs/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# input/bugs/Makefile - -depth = ../.. - -LOCALMAKEFILES=Mutopia -include $(depth)/make/Stepmake.make - - diff --git a/input/test/Makefile b/input/test/GNUmakefile index 4e5503bec8..74fec0e68d 100644 --- a/input/test/Makefile +++ b/input/test/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. examples=font20 hara-kiri grace mark denneboom -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/intl/Makefile b/intl/GNUmakefile index 7679393f40..0bce164e3d 100644 --- a/intl/Makefile +++ b/intl/GNUmakefile @@ -4,9 +4,6 @@ depth = .. NAME = intl -include $(depth)/make/Stepmake.make -include $(stepdir)/C.make - # MODULE_CXXFLAGS += -D_REENTRANT MAINTARGET = $(LIBRARY)# huh? @@ -19,6 +16,11 @@ EXTRA_CFLAGS = -I. $(URG_DEFINES) EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog libintl.inst $(SED_FILES) + + +STEPMAKE_TEMPLATES=c +include $(depth)/make/stepmake.make + default: @echo "to install libintl type 'make lib; make install-lib'" diff --git a/intl/Makefile.in.dist b/intl/Makefile.in.dist index 2a05735516..3d3f59cb01 100644 --- a/intl/Makefile.in.dist +++ b/intl/Makefile.in.dist @@ -68,7 +68,7 @@ DISTFILES.gettext = $(DISTFILES.common) libintl.glibc libintl.inst .c.o: $(COMPILE) $< -INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib +INCLUDEs = -i.. -i. -i$(top_srcdir)/intl -i$(top_srcdir)/lib all: libintl.a diff --git a/lib/Makefile b/lib/GNUmakefile index 93e2b14a67..70008444f6 100644 --- a/lib/Makefile +++ b/lib/GNUmakefile @@ -6,8 +6,8 @@ NAME = lily SUBDIRS = include # MODULE_LIBS= $(depth)/flower MODULE_CXXFLAGS += -D_REENTRANT -MAKEFILES=Library C++ +STEPMAKE_TEMPLATES=library c++ -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/lib/include/GNUmakefile b/lib/include/GNUmakefile new file mode 100644 index 0000000000..7dccdbc530 --- /dev/null +++ b/lib/include/GNUmakefile @@ -0,0 +1,9 @@ +# lib/include/Makefile + +depth = ../.. +STEPMAKE_TEMPLATES=c++ + +include $(depth)/make/stepmake.make + + + diff --git a/lib/include/Makefile b/lib/include/Makefile deleted file mode 100644 index cfe217044e..0000000000 --- a/lib/include/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# lib/include/Makefile - -depth = ../.. -MAKEFILES=C++ - -include $(depth)/make/Stepmake.make - - - diff --git a/lily/Makefile b/lily/GNUmakefile index d5464bf147..47338e5c36 100644 --- a/lily/Makefile +++ b/lily/GNUmakefile @@ -9,12 +9,13 @@ SUBDIRS = include EXTRA_DIST_FILES = VERSION MODULE_LIBS=$(depth)/lib $(depth)/flower -MAKEFILES=C++ Executable +STEPMAKE_TEMPLATES= c++ executable -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make # force these: Make can't know these have to be generated in advance -my-lily-lexer.cc: $(outdir)/parser.hh +$(outdir)/my-lily-parser.o: $(outdir)/parser.hh +$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh $(outdir)/lexer.o: $(outdir)/parser.hh diff --git a/lily/VERSION b/lily/VERSION index d019117582..875f4fb000 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=3 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=4 +MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/lily/include/GNUmakefile b/lily/include/GNUmakefile new file mode 100644 index 0000000000..ae2bfb62f3 --- /dev/null +++ b/lily/include/GNUmakefile @@ -0,0 +1,8 @@ +# lily/include/Makefile + +depth = ../.. +STEPMAKE_TEMPLATES=c++ + +include $(depth)/make/stepmake.make + + diff --git a/lily/include/Makefile b/lily/include/Makefile deleted file mode 100644 index a9ebc88ea5..0000000000 --- a/lily/include/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# lily/include/Makefile - -depth = ../.. -MAKEFILES=C++ - -include $(depth)/make/Stepmake.make - - diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh index 296350de45..e4b42d1233 100644 --- a/lily/include/text-def.hh +++ b/lily/include/text-def.hh @@ -36,6 +36,8 @@ public: Text_def(); virtual void print() const; virtual Interval width (Paper_def*) const; +private: + Real guess_width_f(Atom&) const; }; #endif // TEXT_DEF_HH diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 8ed3989043..ceba7c467e 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -44,6 +44,11 @@ Lyric_engraver::do_process_requests() { td_p->style_str_ = style; } + Scalar alignment = get_property ("textalignment"); + if (alignment.isnum_b()) + { + td_p->align_dir_= (Direction)(int)alignment; + } lyric_item_p_ = new Text_item (td_p); diff --git a/lily/parser.yy b/lily/parser.yy index 4b9ec9fd2f..5df3722a0a 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1112,7 +1112,7 @@ script_req: gen_script_def: text_def { $$ = $1; - ((Text_def*) $$)->align_dir_ = CENTER; /* UGH */ + ((Text_def*) $$)->align_dir_ = LEFT; /* UGH */ } | mudela_script { $$ = $1; diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 435e312729..671ca17e38 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -69,6 +69,11 @@ Script_engraver::do_pre_move_processing() { td_l->style_str_= style; } + Scalar alignment = get_property ("textalignment"); + if (alignment.isnum_b()) + { + td_l->align_dir_= (Direction)(int)alignment; + } } typeset_element (script_p); } diff --git a/lily/text-def.cc b/lily/text-def.cc index b0dbaf5611..6c1664017b 100644 --- a/lily/text-def.cc +++ b/lily/text-def.cc @@ -12,6 +12,7 @@ #include "molecule.hh" #include "text-def.hh" #include "dimension.hh" +#include <ctype.h> Direction Text_def::staff_dir () const @@ -21,16 +22,29 @@ Text_def::staff_dir () const return DOWN; } +Real +Text_def::guess_width_f(Atom& a) const +{ + // Count each TeX command as one character, ugh + int index, length=0; + int total_length=text_str_.length_i(); + const char* str=text_str_.ch_C(); + for (index=0;index<total_length;index++) { + length++; + if (str[index]=='\\') + for (index++;(index < total_length) && isalpha(str[index]);index++) + ; + } + return length * a.dim_.x ().length (); // ugh +} + Interval Text_def::width (Paper_def * p) const { Atom a = get_atom (p,CENTER); - /* TODO: check string for \texcommand - */ - Real guess_width_f = text_str_.length_i() * a.dim_.x ().length (); // ugh - Interval i (0, guess_width_f); + Interval i (0, guess_width_f(a)); i += - (align_dir_ + 1)* i.center(); return i; } @@ -62,8 +76,7 @@ Text_def::get_atom (Paper_def *p, Direction) const { Atom a= p->lookup_l(0)->text (style_str_, text_str_); - Real guess_width_f = text_str_.length_i() * a.dim_.x ().length (); // ugh - a.translate_axis (-(align_dir_ + 1)* guess_width_f/ 2, X_AXIS); + a.translate_axis (-(align_dir_ + 1)* guess_width_f (a) / 2, X_AXIS); return a; } diff --git a/make/Docrules.make b/make/Docrules.make deleted file mode 100644 index 4b1c2612a4..0000000000 --- a/make/Docrules.make +++ /dev/null @@ -1,3 +0,0 @@ -# Docrules.make - -include $(make-dir)/Mudela_rules.make diff --git a/stepmake/make/Makefile b/make/GNUmakefile index 324c7971d2..441e932170 100644 --- a/stepmake/make/Makefile +++ b/make/GNUmakefile @@ -1,10 +1,10 @@ # file make/Makefile depth = .. -MAKEFILES=Makedir +STEPMAKE_TEMPLATES=makedir BLURBS=BLURB # COPERTINA FLAPTEKST -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/make/Makefile b/make/Makefile deleted file mode 100644 index dec2c68008..0000000000 --- a/make/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# file make/Makefile - -depth = .. -BLURBS=BLURB COPERTINA FLAPTEKST -MAKEFILES=Makedir - - -include $(depth)/make/Stepmake.make - - - - - diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR deleted file mode 100644 index 6e2775ab20..0000000000 --- a/make/STATE-VECTOR +++ /dev/null @@ -1,67 +0,0 @@ -0.1.76 -0.1.76.jcn1 -0.1.77 -0.1.77.uu1 -0.1.77.hwjc -0.1.77.jcn1 -0.1.77.jcn2 -0.1.77.hwn1 -0.1.78 -0.1.78.hwn1 -0.1.78.jcn1 -0.1.78.jcn2 -0.1.79 -0.1.79.hwn1 -0.1.79.jcn2 -0.1.80 -0.1.80.jcn1 -0.1.80.eb1 -0.1.80.hwn1 -0.1.81 -0.1.81.jcn1 -0.1.81.jbr2 -0.1.81.jcn2 -0.1.81.jbr1 -0.1.81.jcn1 -0.1.81.hwn1 -0.1.81.hwn2 -0.1.82 -0.1.82.jcn1 -0.1.82.jcn2 -0.1.82.jcn3 -0.1.82.jcn4 -0.1.82.jcn5 -0.1.82.hwn1 -0.1.82.hwn2 -0.1.83 -0.1.83.hwn1 -0.1.83.jcn1 -0.1.83.uu1 -0.1.83.hwn1 -0.1.83.hwn2 -0.1.83.hwn3 -0.1.83.hwn4 -0.1.83.hwn5 -0.1.83.jcn4 -0.1.84 -0.1.84.jcn1 -0.1.84.hwn1 -0.1.84.jcn2 -0.1.84.hwn2 -0.1.84.jcn3 -0.1.84.hwn4 -0.1.85 -0.1.85.jcn1 -0.1.85.hwn1 -0.1.85.jcn2 -1.0.0 -1.0.0.hwn1 -1.0.0.hwn2 -1.0.1 -1.0.1.jbr1 -1.0.1.jcn2 -1.0.1.jbr2 -1.0.2 -1.0.2.hwn1 -1.0.3 -1.0.3.jcn1 diff --git a/make/Stepmake.make b/make/Stepmake.make deleted file mode 100644 index c8c827e18a..0000000000 --- a/make/Stepmake.make +++ /dev/null @@ -1,45 +0,0 @@ -# make/Stepmake.make - -include $(depth)/make/Toplevel_version.make - -# Don't try to outsmart us, you puny computer! -ifeq (0,${MAKELEVEL}) - MAKE:=$(MAKE) --no-builtin-rules -endif - -ifndef config - configuration=config -else - configuration=config-$(config) -endif - -include $(depth)/$(configuration).make - -ifdef CONFIGSUFFIX -outdir=out-$(CONFIGSUFFIX) -else -outdir=out -endif - - - -stepdir = $(depth)/$(stepmake)/stepmake -include $(stepdir)/Include.make - -MAKEFILES := Generic $(MAKEFILES) - -include $(addprefix $(stepdir)/,$(addsuffix _vars.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _vars.make, $(LOCALMAKEFILES))) -include $(addprefix $(stepdir)/,$(addsuffix _rules.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _rules.make, $(LOCALMAKEFILES))) -include $(addprefix $(stepdir)/,$(addsuffix _targets.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _targets.make, $(LOCALMAKEFILES))) - -# ugh. ugh ugh ugh -$(depth)/$(configuration).make: $(depth)/configure - @echo "**************************************" - @echo "configure changed! You should probably reconfigure manually." - @echo "**************************************" - (cd $(depth); ./config.status) - - diff --git a/make/Targets.make b/make/Targets.make deleted file mode 100644 index f2b55fbaeb..0000000000 --- a/make/Targets.make +++ /dev/null @@ -1,8 +0,0 @@ -# title package specific targets -# file make/Targets.make - - -# urg! -$(configheader): $(depth)/$(configuration).hh - cp $< $@ - diff --git a/make/docrules.make b/make/docrules.make new file mode 100644 index 0000000000..9351453aa5 --- /dev/null +++ b/make/docrules.make @@ -0,0 +1,3 @@ +# Docrules.make + +include $(make-dir)/mudela_rules.make diff --git a/make/Rules.make b/make/generic-rules.make index 8ea9451bdc..1d885c7920 100644 --- a/make/Rules.make +++ b/make/generic-rules.make @@ -11,14 +11,8 @@ $(outdir)/%: %.in -include $(depth)/make/Substitute.make - -# $(depth)/make/$(outdir)/%.make: $(depth)/make/%.in -# rm -f $@ -# echo "$(basename $(@F)) = \\" > $@ -# cat $< | $(sed-newline) | $(sed-endline) | $(sed-quotes) >> $@ -# echo >> $@ -# echo >> $@ +include $(depth)/make/substitute.make + # HUH??? $(outdir)/%.hh: $(doc-dir)/%.in diff --git a/make/generic-targets.make b/make/generic-targets.make new file mode 100644 index 0000000000..7f4a380a20 --- /dev/null +++ b/make/generic-targets.make @@ -0,0 +1,2 @@ +# title package specific targets +# file make/Targets.make diff --git a/make/Variables.make b/make/generic-vars.make index a547619332..8c90d01de8 100644 --- a/make/Variables.make +++ b/make/generic-vars.make @@ -22,8 +22,6 @@ include-flower = $(depth)/flower/include LILYPOND_INCLUDES = $(include-lib) $(depth)/lib/$(outdir) $(include-flower) $(depth)/flower/$(outdir) -LILYPOND_LDFLAGS = -L$(depth)/lib/$(outdir) -L$(depth)/flower/$(outdir) -LILYPOND_LIBES = # should use to create .spec ? diff --git a/make/Lilypond_rules.make b/make/lilypond-rules.make index ea30561d83..ea30561d83 100644 --- a/make/Lilypond_rules.make +++ b/make/lilypond-rules.make diff --git a/make/Lilypond_targets.make b/make/lilypond-targets.make index ea30561d83..ea30561d83 100644 --- a/make/Lilypond_targets.make +++ b/make/lilypond-targets.make diff --git a/make/Lilypond_vars.make b/make/lilypond-vars.make index 1452731b2d..1452731b2d 100644 --- a/make/Lilypond_vars.make +++ b/make/lilypond-vars.make diff --git a/make/Mudela_rules.make b/make/mudela-rules.make index 5a7d8ef670..5a7d8ef670 100644 --- a/make/Mudela_rules.make +++ b/make/mudela-rules.make diff --git a/stepmake/stepmake/C++_files.make b/make/mudela-targets.make index 8b13789179..8b13789179 100644 --- a/stepmake/stepmake/C++_files.make +++ b/make/mudela-targets.make diff --git a/make/mudela-vars.make b/make/mudela-vars.make new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/make/mudela-vars.make @@ -0,0 +1 @@ + diff --git a/make/Mutopia_rules.make b/make/mutopia-rules.make index 0b16e7e68a..0b16e7e68a 100644 --- a/make/Mutopia_rules.make +++ b/make/mutopia-rules.make diff --git a/make/Mutopia_targets.make b/make/mutopia-targets.make index 4aa51ff017..4aa51ff017 100644 --- a/make/Mutopia_targets.make +++ b/make/mutopia-targets.make diff --git a/make/Mutopia_vars.make b/make/mutopia-vars.make index b05154a30c..92ef7c0e5a 100644 --- a/make/Mutopia_vars.make +++ b/make/mutopia-vars.make @@ -1,6 +1,6 @@ # UGH UGH -include $(make-dir)/Lilypond_vars.make +include $(make-dir)/lilypond-vars.make FLY_FILES = $(wildcard *.fly) LY_FILES = $(wildcard *.ly) diff --git a/make/Mutopia.make b/make/mutopia.make index 1c541ee636..1c541ee636 100644 --- a/make/Mutopia.make +++ b/make/mutopia.make diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 4303590da8..e8e8b5a297 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,22 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.3 -Inschrijf datum: 19AUG98 -Beschrijving: -LilyPond is de muziekzetter van het GNU Project. Dit programma drukt -prachtige bladmuziek volgens een muzikaal definitie bestand. Ook kan -het een mechanische uitvoering afspelen naar een MIDI bestand. -Bijzondere kunstjes zijn verscheidene notenbalken, maatsoorten, -sleutels, toonaarden, zangteksten, krachtige invoer taal, cadensa, -balken, boogjes, triolen, partituren, en uittreksels voor individuele -partijen. Een fraaie set muziektekens is inbegrepen. +Versie: 1.0.4 +Inschrijf datum: 24AUG98 +Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.0.3.tar.gz + 770k lilypond-1.0.4.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.3.tar.gz + 770k lilypond-1.0.4.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index d85b09323d..962f34360f 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.3 -Entered-date: 19AUG98 +Version: 1.0.4 +Entered-date: 24AUG98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.0.3.tar.gz + 770k lilypond-1.0.4.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.3.tar.gz + 770k lilypond-1.0.4.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 37498a2490..e04958140d 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.0.3 +Version: 1.0.4 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.3.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.4.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl> diff --git a/make/stepmake.make b/make/stepmake.make new file mode 100644 index 0000000000..e08af849a4 --- /dev/null +++ b/make/stepmake.make @@ -0,0 +1,41 @@ +# make/Stepmake.make + +include $(depth)/make/toplevel-version.make + +# Don't try to outsmart us, you puny computer! +ifeq (0,${MAKELEVEL}) + MAKE:=$(MAKE) --no-builtin-rules +endif +.SUFFIXES: + + +ifndef config + configuration=config +else + configuration=config-$(config) +endif + +include $(depth)/$(configuration).make + +ifdef CONFIGSUFFIX +outdir=out-$(CONFIGSUFFIX) +else +outdir=out +endif + +stepdir = $(depth)/$(stepmake)/stepmake + +STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) +LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES) + + +all: + +include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) +include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) +include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) + + diff --git a/make/Substitute.make b/make/substitute.make index 16389f92a1..6e80db582f 100644 --- a/make/Substitute.make +++ b/make/substitute.make @@ -1,7 +1,7 @@ # make/Substitute.make -sed-examples = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g' -sed-docs=sed 's!@TEXT_DOCS@!${rpmdocs}!g' +#guh +include $(stepdir)/substitute-vars.make ATVARIABLES = \ BASH\ diff --git a/make/Toplevel_version.make b/make/toplevel-version.make index 4a1e24e9e2..4a1e24e9e2 100644 --- a/make/Toplevel_version.make +++ b/make/toplevel-version.make diff --git a/make/Toplevel.make.in b/make/toplevel.make.in index b09aa86c77..99f7a0ad84 100644 --- a/make/Toplevel.make.in +++ b/make/toplevel.make.in @@ -20,18 +20,11 @@ IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = dstreamrc mudela-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) - # bootstrap stepmake: # -include $(depth)/make/Stepmake.make -# - -# list of distribution files: +STEPMAKE_TEMPLATES=toplevel yolily-toplevel +include $(depth)/make/stepmake.make # -include $(stepdir)/Toplevel.make - -aclocal.m4: $(stepdir)/../aclocal.m4 - cp $< $@ website: examples htmldoc doc++ @@ -40,17 +33,3 @@ examples: $(MAKE) CONFIGSUFFIX='www' -C mutopia WWW tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' -czf $(outdir)/examples.tar.gz `find input mutopia -type d -name 'out-www' -print` - -local-dist: do-top-doc - -$(package-icon): - $(MAKE) -C Documentation/pictures icon - - - -do-top-doc: - -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top - -$(README_TXT_FILES): do-top-doc - - diff --git a/mf/Makefile b/mf/GNUmakefile index 11418e32e9..07d99c1758 100644 --- a/mf/Makefile +++ b/mf/GNUmakefile @@ -2,7 +2,7 @@ depth = .. -MAKEFILES=Metafont +STEPMAKE_TEMPLATES=metafont EXTRA_DIST_FILES += TODO README @@ -17,7 +17,7 @@ ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) OUT_DIST_FILES += $(AFM_FILES) -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make default: $(ALL_GEN_FILES) @@ -26,11 +26,11 @@ $(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(outdir)/$(<F:.log=.ly) --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $< -TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(stepdir)/Install_outfiles.sub.make $@ +TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(stepdir)/install-outfiles.sub.make $@ -AFMINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(AFM_FILES)" -f $(stepdir)/Install_outfiles.sub.make $@ +AFMINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(AFM_FILES)" -f $(stepdir)/install-outfiles.sub.make $@ -LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(stepdir)/Install_outfiles.sub.make $@ +LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(stepdir)/install-outfiles.sub.make $@ localinstall: $(ALL_GEN_FILES) $(TEXINSTALL) @@ -45,5 +45,5 @@ localuninstall: INSTALLATION_DIR=$(MFDIR)/public/lilypond INSTALLATION_FILES=$(MF_FILES) -include $(stepdir)/Installfiles.make +include $(stepdir)/installfiles.make diff --git a/mf/feta-params.mf b/mf/feta-params.mf index 1ae189f1fa..fe1200789c 100644 --- a/mf/feta-params.mf +++ b/mf/feta-params.mf @@ -3,6 +3,9 @@ stafflines = 5; interline#:=staffsize#/(stafflines-1); +% URG! +% font_x_height ( interline# ); + % % [D.K.Roush & J.S.Gourlay] say this should be 0.072 % We know better diff --git a/mi2mu/Makefile b/mi2mu/GNUmakefile index 6b6d9552bd..067b0c5c17 100644 --- a/mi2mu/Makefile +++ b/mi2mu/GNUmakefile @@ -10,9 +10,9 @@ SUBDIRS = include EXTRA_DIST_FILES += TODO MODULE_LIBS=$(depth)/lib $(depth)/flower -MAKEFILES=C++ Executable +STEPMAKE_TEMPLATES=c++ executable -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make # explicit dependencies: (how to do auto?) # diff --git a/mi2mu/include/GNUmakefile b/mi2mu/include/GNUmakefile new file mode 100644 index 0000000000..1a19230204 --- /dev/null +++ b/mi2mu/include/GNUmakefile @@ -0,0 +1,6 @@ +# lib/include/Makefile + +depth = ../.. +STEPMAKE_TEMPLATES=c++ +include $(depth)/make/stepmake.make + diff --git a/mi2mu/include/Makefile b/mi2mu/include/Makefile deleted file mode 100644 index 3f9a0ac423..0000000000 --- a/mi2mu/include/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# lib/include/Makefile - -depth = ../.. -MAKEFILES=C++ -include $(depth)/make/Stepmake.make - diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/GNUmakefile index 6fcbed0202..90bb711455 100644 --- a/mutopia/Coriolan/Makefile +++ b/mutopia/Coriolan/GNUmakefile @@ -6,7 +6,7 @@ depth = ../.. examples=coriolan oboi-part viola-part # examples= oboi-part viola-part -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/mutopia/Makefile b/mutopia/GNUmakefile index b4ab368841..5ae86949b1 100644 --- a/mutopia/Makefile +++ b/mutopia/GNUmakefile @@ -5,10 +5,9 @@ depth = .. SUBDIRS = J.S.Bach Coriolan W.A.Mozart examples=standchen gallina -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make -include $(make-dir)/Mutopia.make +include $(depth)/make/stepmake.make EXTRA_DIST_FILES += TODO diff --git a/mutopia/J.S.Bach/Makefile b/mutopia/J.S.Bach/GNUmakefile index 1c0dfadef2..c5f8a88257 100644 --- a/mutopia/J.S.Bach/Makefile +++ b/mutopia/J.S.Bach/GNUmakefile @@ -6,8 +6,8 @@ SUBDIRS = Petites-Preludes Solo-Cello-Suites EXTRA_DIST_FILES= -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia examples=wtk1-fugue2 -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Petites-Preludes/Makefile b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile index 0abaee2e49..e1d72d7d30 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/Makefile +++ b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile @@ -5,6 +5,6 @@ depth = ../../.. EXTRA_DIST_FILES= examples=preludes-2 -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile index 95b05a7a44..18e9385e3f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile @@ -5,6 +5,6 @@ depth = ../../.. EXTRA_DIST_FILES= examples=scsii-cello -LOCALMAKEFILES=Mutopia +LOCALSTEPMAKE_TEMPLATES=mutopia -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly index cd01a3a74b..e8fbc3bda3 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly @@ -1,8 +1,8 @@ \header{ -filename = "allemande-viola.ly"; +filename = "allemande-alto.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Allemande"; +piece = "Allemande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -19,7 +19,7 @@ copyright = "public domain"; \include "allemande-urtext.ly"; -allemande_viola_global = \melodic{ +allemande_alto_global = \melodic{ \time 4/4; \key f; \partial 16; @@ -32,19 +32,18 @@ allemande_viola_global = \melodic{ \bar ":|"; } -allemande_viola_scripts = \melodic{ +allemande_alto_scripts = \melodic{ } -allemande_viola_staff = \type Staff < +allemande_alto_staff = \type Staff < \melodic \transpose c'' \$allemande - \$allemande_viola_global - \$allemande_viola_scripts + \$allemande_alto_global + \$allemande_alto_scripts > \score{ - \$allemande_viola_staff + \$allemande_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 45; } - \header{ piece = "Allemande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index c1f7e46dca..114480452c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -2,7 +2,7 @@ filename = "allemande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -%piece = "Allemande"; +piece = "Allemande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,6 +45,5 @@ allemande_cello_staff = \type Staff < \$allemande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 45; } - \header{ piece = "Allemande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 5d80bab714..0b9c0fb9bb 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -1,10 +1,10 @@ % allemande-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see viola_scripts). +But merging melodic and scripts doen't work too well yet (see alto_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly index a6097d0770..8e7f0970be 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly @@ -1,8 +1,8 @@ \header{ -filename = "courante-viola.ly"; +filename = "courante-alto.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Courante"; +piece = "Courante"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -19,7 +19,7 @@ copyright = "public domain"; \include "courante-urtext.ly"; -courante_viola_global = \melodic{ +courante_alto_global = \melodic{ \time 3/4; \key f; \partial 16; @@ -32,19 +32,18 @@ courante_viola_global = \melodic{ \bar ":|"; } -courante_viola_scripts = \melodic{ +courante_alto_scripts = \melodic{ } -courante_viola_staff = \type Staff < +courante_alto_staff = \type Staff < \melodic \transpose c' \$courante - \$courante_viola_global - \$courante_viola_scripts + \$courante_alto_global + \$courante_alto_scripts > \score{ - \$courante_viola_staff + \$courante_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 55; } - \header{ piece = "Courante"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index da6812acd7..5909c0be7d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -2,7 +2,7 @@ filename = "courante-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Courante"; +piece = "Courante"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,6 +45,5 @@ courante_cello_staff = \type Staff < \$courante_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 55; } - \header{ piece = "Courante"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index 3d540b4378..c04de2dac6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -1,10 +1,10 @@ % courante-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see viola_scripts). +But merging melodic and scripts doen't work too well yet (see alto_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly index 384768575f..784dea6b29 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly @@ -2,7 +2,7 @@ filename = "gigue-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Gigue"; +piece = "Pr\\'elude"; % duh % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -23,7 +23,7 @@ gigue_cello_global = \melodic{ \time 3/8; \key f; \clef bass; - \partial 8; + \partial 8 \skip 4.*31; s4 \bar ":|:"; @@ -46,6 +46,5 @@ gigue_cello_staff = \type Staff < \include "scs-paper.ly"; %broken \midi{ \tempo 4 = 60; } - \header{ piece = "Gigue"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 8d08d1de8a..70c72a36f6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -2,7 +2,7 @@ filename = "gigue-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Gigue"; +piece = "Pr\\'elude"; % duh % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -45,6 +45,5 @@ gigue_cello_staff = \type Staff < \$gigue_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 60; } - \header{ piece = "Gigue"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index 8f36fb38bd..100156c7d7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -1,10 +1,10 @@ % gigue-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see viola_scripts). +But merging melodic and scripts doen't work too well yet (see alto_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly index b2fee93df9..96ed306a9f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly @@ -1,9 +1,9 @@ \header{ -filename = "menuetto-viola.ly"; +filename = "menuetto-alto.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Menuetto I"; -description = "Transcribed for Viola"; +piece = "Menuetto I"; +description = "Transcribed for Alto"; source = "?"; % opus = "BWV 1008 no. 5"; opus = ""; @@ -21,7 +21,7 @@ copyright = "public domain"; \include "menuetto-urtext.ly"; -menuetto_i_viola_global = \melodic{ +menuetto_i_alto_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -37,7 +37,7 @@ menuetto_i_viola_global = \melodic{ \bar ":|"; } -menuetto_i_viola_scripts = \melodic{ +menuetto_i_alto_scripts = \melodic{ s2. s8^"~"^1_2_4 s8*5 s2.*5 @@ -52,20 +52,19 @@ menuetto_i_viola_scripts = \melodic{ s4-\downbow s4-\upbow } -menuetto_i_viola_staff = \type Staff < +menuetto_i_alto_staff = \type Staff < \melodic \transpose c' \$menuetto_i - \$menuetto_i_viola_global -% \$menuetto_i_viola_scripts + \$menuetto_i_alto_global +% \$menuetto_i_alto_scripts > \score{ - \$menuetto_i_viola_staff + \$menuetto_i_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 110; } - \header{ piece = "Menuetto I"; } } -menuetto_ii_viola_global = \melodic{ +menuetto_ii_alto_global = \melodic{ \time 3/4; \key D; \clef alto; @@ -78,16 +77,19 @@ menuetto_ii_viola_global = \melodic{ \bar ":|"; } -menuetto_ii_viola_staff = \type Staff < +menuetto_ii_alto_staff = \type Staff < \melodic \transpose c' \$menuetto_ii - \$menuetto_ii_viola_global -% \$menuetto_ii_viola_scripts + \$menuetto_ii_alto_global +% \$menuetto_ii_alto_scripts > +\header{ +piece = "Menuetto II"; +opus = ""; +} \score{ - \$menuetto_ii_viola_staff + \$menuetto_ii_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 130; } - \header{ piece = "Menuetto II"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 461c6ffca8..5d5f9c4d0d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -2,7 +2,7 @@ filename = "menuetto-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -%piece = "Menuetto I"; +piece = "Menuetto I"; source = "?"; % opus = "BWV 1008 no. 5"; opus = ""; @@ -63,7 +63,6 @@ menuetto_i_cello_staff = \type Staff < \$menuetto_i_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 110; } - \header{ piece = "Menuetto I"; } } menuetto_ii_cello_global = \melodic{ @@ -85,10 +84,13 @@ menuetto_ii_cello_staff = \type Staff < % \$menuetto_ii_cello_scripts > +\header{ +piece = "Menuetto II"; +opus = ""; +} \score{ \$menuetto_ii_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 130; } - \header{ piece = "Menuetto II"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 76c93f5fb7..67e2f44128 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -1,10 +1,10 @@ % menuetto-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see viola_scripts). +But merging melodic and scripts doen't work too well yet (see alto_scripts). %} menuetto_i_a = \melodic \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly index dd8ff62712..2219165c5e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly @@ -1,8 +1,8 @@ \header{ -filename = "prelude-viola.ly"; +filename = "prelude-alto.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Pr\\'elude"; % duh +piece = "Pr\\'elude"; % duh opus = "BWV 1008"; % opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -19,7 +19,7 @@ copyright = "public domain"; \include "prelude-urtext.ly"; -prelude_viola_global = \melodic{ +prelude_alto_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -27,19 +27,18 @@ prelude_viola_global = \melodic{ \bar "|."; } -prelude_viola_scripts = \melodic{ +prelude_alto_scripts = \melodic{ } -prelude_viola_staff = \type Staff < +prelude_alto_staff = \type Staff < \melodic \transpose c' \$prelude - \$prelude_viola_global - \$prelude_viola_scripts + \$prelude_alto_global + \$prelude_alto_scripts > \score{ - \$prelude_viola_staff + \$prelude_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } - \header{ piece = "Pr\\'elude"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index fd071234ce..d872e5ccb8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -2,7 +2,7 @@ filename = "prelude-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -%piece = "Pr\\'elude"; % duh +piece = "Pr\\'elude"; % duh opus = "BWV 1008"; % opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -40,6 +40,5 @@ prelude_cello_staff = \type Staff < \$prelude_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } - \header{ piece = "Pr\\'elude"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index 2c31ae382d..f93032b967 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -1,10 +1,10 @@ % prelude-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % who is going to make a -violin.ly? %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet see viola_scripts . +But merging melodic and scripts doen't work too well yet see alto_scripts . %} % urg, Thread is gone, try Voice diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly index 864fb0d7b3..b39274e169 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly @@ -1,8 +1,8 @@ \header{ -filename = "sarabande-viola.ly"; +filename = "sarabande-alto.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Sarabande"; +piece = "Sarabande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -19,7 +19,7 @@ copyright = "public domain"; \include "sarabande-urtext.ly"; -sarabande_viola_global = \melodic{ +sarabande_alto_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -29,19 +29,18 @@ sarabande_viola_global = \melodic{ \bar ":|"; } -sarabande_viola_scripts = \melodic{ +sarabande_alto_scripts = \melodic{ } -sarabande_viola_staff = \type Staff < +sarabande_alto_staff = \type Staff < \melodic \transpose c' \$sarabande - \$sarabande_viola_global - \$sarabande_viola_scripts + \$sarabande_alto_global + \$sarabande_alto_scripts > \score{ - \$sarabande_viola_staff + \$sarabande_alto_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } - \header{ piece = "Sarabande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index db57bec6c8..4a8002713e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -2,7 +2,7 @@ filename = "sarabande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -% piece = "Sarabande"; +piece = "Sarabande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -42,6 +42,5 @@ sarabande_cello_staff = \type Staff < \$sarabande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } - \header{ piece = "Sarabande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 1a82029959..00db06b77e 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -1,10 +1,10 @@ % sarabande-urtext.ly -% belongs together with -cello.ly and -viola.ly +% belongs together with -cello.ly and -alto.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see viola_scripts). +But merging melodic and scripts doen't work too well yet (see alto_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly index b6db279eec..e0ba58142c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly @@ -2,6 +2,6 @@ instrument="Alto"; } -instrument="viola"; +instrument="alto"; \include "solo-cello-suite-ii.ly" diff --git a/mutopia/W.A.Mozart/GNUmakefile b/mutopia/W.A.Mozart/GNUmakefile new file mode 100644 index 0000000000..d8a0eebd19 --- /dev/null +++ b/mutopia/W.A.Mozart/GNUmakefile @@ -0,0 +1,10 @@ +# mutopia/W.A.Mozart + +depth = ../.. + +examples=cadenza +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/make/stepmake.make + + diff --git a/mutopia/W.A.Mozart/Makefile b/mutopia/W.A.Mozart/Makefile deleted file mode 100644 index d6b63889f1..0000000000 --- a/mutopia/W.A.Mozart/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# mutopia/W.A.Mozart - -depth = ../.. - -examples=cadenza -LOCALMAKEFILES=Mutopia - -include $(depth)/make/Stepmake.make - - diff --git a/po/Makefile b/po/GNUmakefile index e0c550371e..8dc71cb5db 100644 --- a/po/Makefile +++ b/po/GNUmakefile @@ -12,8 +12,8 @@ HELP_CATALOGS = $(PO_FILES:%.po=%) CATALOGS = $(HELP_CATALOGS:lilypond=) EXTRA_DIST_FILES = TODO $(PO_FILES) -include $(depth)/make/Stepmake.make -include $(stepdir)/Po_rules.make +include $(depth)/make/stepmake.make +include $(stepdir)/po-rules.make default: $(MO_FILES) diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile new file mode 100644 index 0000000000..0605eb6d64 --- /dev/null +++ b/scripts/GNUmakefile @@ -0,0 +1,12 @@ +# bin/Makefile + +depth = .. +SEXECUTABLES=convert-mudela mudela-book ly2dvi +STEPMAKE_TEMPLATES=script + + +include $(depth)/make/stepmake.make + +# include $(stepdir)/Executable_targets.make + + diff --git a/scripts/Makefile b/scripts/Makefile deleted file mode 100644 index 34f2344189..0000000000 --- a/scripts/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# bin/Makefile - -depth = .. -SEXECUTABLES=convert-mudela mudela-book ly2dvi -MAKEFILES=Script - - -include $(depth)/make/Stepmake.make - -include $(stepdir)/Executable_targets.make - - diff --git a/scripts/ly2dvi.sh b/scripts/ly2dvi.sh index 1af0885bd6..5280c852df 100644 --- a/scripts/ly2dvi.sh +++ b/scripts/ly2dvi.sh @@ -10,7 +10,7 @@ # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.12.jcn1" +VERSION="0.12" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` @@ -21,11 +21,9 @@ echo "$IDENTIFICATION" 1>&2 # NEWS -# 0.12.jcn1 -# - mudelaDefs really fixed (sorry, PC) - # 0.12 # - -S/--sourcedir switch +# # #0.11.jcn3 @@ -614,10 +612,11 @@ shift `expr $OPTIND - 1` if [ "$SOURCEDIR" != "" ]; then # apparently MakeTeXTFM can't handle relative dirs SOURCEDIR=`cd $SOURCEDIR; pwd` - export LILYINCLUDE="$SOURCEDIR/init:$SOURCEDIR/mf/out:$LILYINCLUDE" - export TEXINPUTS="$SOURCEDIR/tex:$TEXINPUTS:" - export MFINPUTS="$SOURCEDIR/mf:$MFINPUTS:" - export LILYPOND_EXECUTABLE="$SOURCEDIR/lily/out/lilypond" + LILYINCLUDE="$SOURCEDIR/init:$SOURCEDIR/mf/out:$LILYINCLUDE" + TEXINPUTS="$SOURCEDIR/tex:$TEXINPUTS:" + MFINPUTS="$SOURCEDIR/mf:$MFINPUTS:" + LILYPOND_EXECUTABLE="$SOURCEDIR/lily/out/lilypond" + export MFINPUTS LILYPOND_EXECUTABLE TEXINPUTS SOURCEDIR fi # @@ -637,28 +636,20 @@ regexp_quote(){ # mudelaDefs(){ # Include \def\mudela-definitions -# The aim here is to pick up the definition for the -# current file, then any other file. # -mudelatmp=$TMP/mudelaDefs$$ -# Use `cat' to prevent filenames being prepended -# -cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp for L in $MU_DEF do - # This converts \def\mudelatitle{fred} - # to \mudelatitle{fred} or to - # \def\mudelatitle{fred} - # and stops after the first one found. - sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{ - s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p - q - }' $mudelatmp >> $LatF + for F in "$File" "$OF" + do + LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"` + [ "$LL" ] && { + Echo "$1\\"$L'{'"$LL"'}%' >> $LatF + break + } + done done -rm -f $mudelatmp } # -# startFile(){ # # LaTeX file name diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py index 088d94b722..bd8c549ae3 100644 --- a/scripts/ly2dvi32.py +++ b/scripts/ly2dvi32.py @@ -1,7 +1,7 @@ #!@PYTHON@ name = 'ly2dvi' -version = '0.0.1' +version = '0.0.2' import sys import os @@ -166,8 +166,12 @@ class TeXOutput: \\end{document} """) this.__fd.close() - stat = os.system('latex \'\\nonstopmode \\input %s\'' % - (this.__outfile)) + if ( os.name == 'posix' ): + stat = os.system('latex \'\\nonstopmode \\input %s\'' % + (this.__outfile)) + else: # Windows shells don't eat the single quotes + stat = os.system('latex \\nonstopmode \\input %s' % + (this.__outfile)) if stat: sys.exit('ExitBadLatex') if os.path.isfile(outfile): @@ -190,10 +194,10 @@ class Properties: def get_texfile_path (this, var): path ='' - cmd =('kpsewhich tex %s' % var) + cmd =('kpsewhich tex %s 2>&1' % var) pipe = os.popen (cmd, 'r') path = pipe.readline ()[:-1] # chop off \n - if not path: + if pipe.close(): path = os.path.join(this.get('root'), 'texmf', 'tex', 'lilypond', var) fd = open(path, 'r') @@ -251,6 +255,7 @@ class Properties: p=os.path.split(p[0]) this.__set('root',p[0],'init') + t='' if os.environ.has_key ('TEXINPUTS'): t = os.pathsep + os.environ['TEXINPUTS'] os.environ['TEXINPUTS'] = os.path.join(this.get('root'), 'texmf', @@ -681,7 +686,7 @@ def main(): infile.open(file) infile.setVars() # first pass set variables infile.close() - Props.printProps() +# Props.printProps() if firstfile: outfile.start(file) else: diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 6c4291c227..ce491b816e 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -1,4 +1,5 @@ -#!@PYTHON@ + +# python version of mudela-book. WIP. # TODO: center option diff --git a/stepmake/Documentation/Makefile b/stepmake/Documentation/GNUmakefile index 6eacb8bf01..c49eec6022 100644 --- a/stepmake/Documentation/Makefile +++ b/stepmake/Documentation/GNUmakefile @@ -8,9 +8,9 @@ EXTRA_DIST_FILES = SUBDIRS=topdocs -MAKEFILES=Documentation +STEPMAKE_TEMPLATES=documentation -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make default: do-doc diff --git a/stepmake/Documentation/topdocs/GNUmakefile b/stepmake/Documentation/topdocs/GNUmakefile new file mode 100644 index 0000000000..d12c14370e --- /dev/null +++ b/stepmake/Documentation/topdocs/GNUmakefile @@ -0,0 +1,15 @@ +# Documentation/topdocs/Makefile + +depth = ../.. + +SUBDIRS= +BLURBS=BLURB #COPERTINA FLAPTEKST +AT_FILES = $(BLURBS) # +at-dir = $(doc-dir)/ +at-ext = .in +BLURBS=BLURB COPERTINA FLAPTEKST + +STEPMAKE_TEMPLATES=documentation yolily-topdoc + +include $(depth)/make/stepmake.make + diff --git a/stepmake/Documentation/topdocs/Makefile b/stepmake/Documentation/topdocs/Makefile deleted file mode 100644 index 45af32d7f0..0000000000 --- a/stepmake/Documentation/topdocs/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Documentation/topdocs/Makefile - -depth = ../.. - -SUBDIRS= -BLURBS=BLURB #COPERTINA FLAPTEKST -AT_FILES = $(BLURBS) # -at-dir = $(doc-dir)/ -at-ext = .in -BLURBS=BLURB COPERTINA FLAPTEKST - -TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) - - -MAKEFILES=Documentation - -include $(depth)/make/Stepmake.make - - -default: do-doc - -# urg -$(outdir)/%.html: %.yo - $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@.in $< - $(sed-version) < $@.in > $@ - rm -f $@.in - $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@ - -local-WWW: - -cp $(outdir)/*gif $(outdir)/index.html $(depth) # don't fail if not making website - -copy-to-top: - $(foreach i, $(TO_TOP_FILES), \ - cp $(i) $(depth)/ && ) true diff --git a/stepmake/NEWS b/stepmake/NEWS index 5578428a8c..75d1d7809f 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,9 @@ +pl 45 + - Foo_rules.make -> foo-rules.make + +pl 44 + - split: Toplevel.make, debian/Makefile, Documentation/topdocs/Makefile + pl 43 - grand split up in targets/rules/variables. The vars should be before rules!! pl 42 diff --git a/stepmake/VERSION b/stepmake/VERSION index eea0d29e8b..8d0a721a4e 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=43 +PATCH_LEVEL=45 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index f7e18136b6..660b3aca0a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -130,7 +130,7 @@ AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) rm -f Makefile - cp make/Toplevel.make.in ./Makefile + cp make/toplevel.make.in ./Makefile chmod 444 Makefile ]) @@ -143,7 +143,7 @@ AC_DEFUN(AC_STEPMAKE_GXX, [ then true else - AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs) + AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs) fi ]) diff --git a/stepmake/bin/Makefile b/stepmake/bin/GNUmakefile index 918a59c1bc..36d16462ca 100644 --- a/stepmake/bin/Makefile +++ b/stepmake/bin/GNUmakefile @@ -3,8 +3,8 @@ depth = .. EXTRA_DIST_FILES = install-sh config.sub config.guess -MAKEFILES=Script +STEPMAKE_TEMPLATES=script -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make diff --git a/stepmake/configure b/stepmake/configure index ee022aefa9..420a69c374 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1590,6 +1590,6 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 rm -f Makefile - cp make/Toplevel.make.in ./Makefile + cp make/toplevel.make.in ./Makefile chmod 444 Makefile diff --git a/stepmake/make/GNUmakefile b/stepmake/make/GNUmakefile new file mode 100644 index 0000000000..bb5632d158 --- /dev/null +++ b/stepmake/make/GNUmakefile @@ -0,0 +1,11 @@ +# file make/Makefile + +depth = .. +STEPMAKE_TEMPLATES=makedir +BLURBS=BLURB # COPERTINA FLAPTEKST + + +include $(depth)/make/stepmake.make + + + diff --git a/stepmake/make/STATE-VECTOR b/stepmake/make/STATE-VECTOR deleted file mode 100644 index 845eee732c..0000000000 --- a/stepmake/make/STATE-VECTOR +++ /dev/null @@ -1,19 +0,0 @@ -0.1.26 -0.1.26.jcn1 -0.1.26.hwn1 -0.1.26.jcn2 -0.1.26.jcn3 -0.1.27 -0.1.28 -0.1.29 -0.1.30 -0.1.32 -0.1.33 -0.1.34 -0.1.35 -0.1.36 -0.1.37 -0.1.38 -0.1.39 -0.1.40 -0.1.41 diff --git a/stepmake/make/Stepmake.make b/stepmake/make/Stepmake.make deleted file mode 100644 index 078bc3749e..0000000000 --- a/stepmake/make/Stepmake.make +++ /dev/null @@ -1,36 +0,0 @@ -# make/Stepmake.make - -include $(depth)/make/Toplevel_version.make - -# Don't try to outsmart us, you puny computer! -ifeq (0,${MAKELEVEL}) - MAKE:=$(MAKE) --no-builtin-rules -endif - -ifndef config - configuration=config -else - configuration=config-$(config) -endif - -include $(depth)/$(configuration).make - -ifdef CONFIGSUFFIX -outdir=out-$(CONFIGSUFFIX) -else -outdir=out -endif - - -stepdir = $(depth)/$(stepmake)/stepmake --include $(stepdir)/Include.make -MAKEFILES := Generic $(MAKEFILES) - -include $(addprefix $(stepdir)/,$(addsuffix _vars.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _vars.make, $(LOCALMAKEFILES))) -include $(addprefix $(stepdir)/,$(addsuffix _rules.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _rules.make, $(LOCALMAKEFILES))) -include $(addprefix $(stepdir)/,$(addsuffix _targets.make, $(MAKEFILES))) -include $(addprefix $(depth)/make/,$(addsuffix _targets.make, $(LOCALMAKEFILES))) - - diff --git a/stepmake/make/User.make b/stepmake/make/User.make deleted file mode 100644 index 598bc732fb..0000000000 --- a/stepmake/make/User.make +++ /dev/null @@ -1,15 +0,0 @@ -# title user changeable settings -# file make/User.make - -# will be split into CFLAGS/EXTRA_CFLAGS etc, -# so that defineable generically and per module - -# -# -lefence = ElectricFence. -# -# ElectricFence is a memory debugger which uses the -# VM hardware to trap malloc/free errors. -# - -EXTRALIB+= #-lefence - diff --git a/stepmake/make/Rules.make b/stepmake/make/generic-rules.make index 38dafc0f24..99d118ecd8 100644 --- a/stepmake/make/Rules.make +++ b/stepmake/make/generic-rules.make @@ -1,6 +1,10 @@ # title package specific rules # file make/Rules.lilymake.make +#UGH + +include $(depth)/make/substitute.make + $(outdir)/%: %.in rm -f $@ cat $< | $(sed-atfiles) | $(sed-atvariables) > $@ diff --git a/stepmake/make/Targets.make b/stepmake/make/generic-targets.make index 5a6603fab0..790abd7a43 100644 --- a/stepmake/make/Targets.make +++ b/stepmake/make/generic-targets.make @@ -3,8 +3,6 @@ .PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-www-doc check-rpm-icons -check-dist-deps: check-make-deps - check-html-deps: $(MAKE) -C $(depth)/Documentation html diff --git a/stepmake/make/Variables.make b/stepmake/make/generic-vars.make index 3c5a39dca3..3c5a39dca3 100644 --- a/stepmake/make/Variables.make +++ b/stepmake/make/generic-vars.make diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm index 695e585333..c9f1388430 100644 --- a/stepmake/make/out/stepmake.lsm +++ b/stepmake/make/out/stepmake.lsm @@ -1,15 +1,15 @@ Begin3 Title: StepMake -Version: 0.1.43 -Entered-date: 19AUG98 +Version: .1.45 +Entered-date: 24AUG98 Description: Keywords: music notation typesetting midi fonts engraving Author: janneke@gnu.org (Jan Nieuwenhuizen) hanwen@cs.ruu.nl (Han-Wen Nienhuys) Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 40k stepmake-0.1.43.tar.gz + 40k stepmake-.1.45.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 40k stepmake-0.1.43.tar.gz + 40k stepmake-.1.45.tar.gz Copying-policy: GPL End diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec index fd9b7f9744..99900b82af 100644 --- a/stepmake/make/out/stepmake.spec +++ b/stepmake/make/out/stepmake.spec @@ -1,9 +1,9 @@ Name: stepmake -Version: 0.1.43 +Version: .1.45 Release: 1 Copyright: GPL Group: Development -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.43.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-.1.45.tar.gz Summary: generic make package Packager: janneke@gnu.org (Jan Nieuwenhuizen) Buildroot: /tmp/stepmake-install diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make new file mode 100644 index 0000000000..9b114e1b20 --- /dev/null +++ b/stepmake/make/stepmake.make @@ -0,0 +1,39 @@ +# make/Stepmake.make + +include $(depth)/make/toplevel-version.make + +# Don't try to outsmart us, you puny computer! +ifeq (0,${MAKELEVEL}) + MAKE:=$(MAKE) --no-builtin-rules +endif + +ifndef config + configuration=config +else + configuration=config-$(config) +endif + +include $(depth)/$(configuration).make + +ifdef CONFIGSUFFIX +outdir=out-$(CONFIGSUFFIX) +else +outdir=out +endif + +stepdir = $(depth)/stepmake + +LOCALSTEPMAKE_TEMPLATES:=generic $(LOCALSTEPMAKE_TEMPLATES) +STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) + +default: + +include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) +include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) +include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) +include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) + + + diff --git a/stepmake/make/Substitute.make b/stepmake/make/substitute.make index 8d5549b2fd..5c12e737dd 100644 --- a/stepmake/make/Substitute.make +++ b/stepmake/make/substitute.make @@ -1,5 +1,6 @@ # Substitute.make +include $(stepdir)/substitute-vars.make ATVARIABLES = \ BASH\ DATE\ diff --git a/stepmake/make/Toplevel_version.make b/stepmake/make/toplevel-version.make index 4a1e24e9e2..c6711a8d2f 100644 --- a/stepmake/make/Toplevel_version.make +++ b/stepmake/make/toplevel-version.make @@ -1,7 +1,6 @@ -# Toplevel_version.make include $(depth)/VERSION -TOPLEVEL_MAJOR_VERSION:=$(MAJOR_VERSION) +topleveL_MAJOR_VERSION:=$(MAJOR_VERSION) TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION) TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL) # use to send patches, always empty for released version: diff --git a/stepmake/make/Toplevel.make.in b/stepmake/make/toplevel.make.in index 67555b6665..4541064055 100644 --- a/stepmake/make/Toplevel.make.in +++ b/stepmake/make/toplevel.make.in @@ -25,16 +25,9 @@ NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) # -include $(depth)/make/Stepmake.make -include $(stepdir)/Toplevel.make - - - -local-dist: do-top-doc - -do-top-doc: - -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top - -$(README_TXT_FILES): do-top-doc - +# bootstrap stepmake: +# +STEPMAKE_TEMPLATES=toplevel +include $(depth)/make/stepmake.make +# diff --git a/make/User.make b/stepmake/make/user.make index 598bc732fb..598bc732fb 100644 --- a/make/User.make +++ b/stepmake/make/user.make diff --git a/stepmake/stepmake/C++.make b/stepmake/stepmake/C++.make deleted file mode 100644 index 3e4b58dee1..0000000000 --- a/stepmake/stepmake/C++.make +++ /dev/null @@ -1,3 +0,0 @@ - -include $(stepdir)/C++_rules.make -include $(stepdir)/C++_vars.make diff --git a/stepmake/stepmake/C.make b/stepmake/stepmake/C.make deleted file mode 100644 index 795296f6f0..0000000000 --- a/stepmake/stepmake/C.make +++ /dev/null @@ -1,6 +0,0 @@ - - -include $(stepdir)/C_vars.make -include $(stepdir)/C_rules.make - - diff --git a/stepmake/stepmake/C_vars.make b/stepmake/stepmake/C_vars.make deleted file mode 100644 index 47d2eb7f41..0000000000 --- a/stepmake/stepmake/C_vars.make +++ /dev/null @@ -1,22 +0,0 @@ - -# header files: -H_FILES := $(wildcard *.h) -C_FILES := $(wildcard *.c) -Y_FILES := $(wildcard *.y) -L_FILES := $(wildcard *.l) - -SOURCE_FILES+=$(Y_FILES) $(C_FILES) $(L_FILES) $(H_FILES) -OBJECT_FILES+=$(Y_FILES:.y=.o) $(C_FILES:.c=.o) $(L_FILES:.l=.o) - -TAGS_FILES += C_FILES H_FILES -# C/C++ -# - -ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) - -# compiler: -# -DO_C_COMPILE = $(DODEP) $(CC) -c $(CFLAGS) $(C_OUTPUT_OPTION) -C_OUTPUT_OPTION = $< -o $@ - -CFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) diff --git a/stepmake/stepmake/Executable.make b/stepmake/stepmake/Executable.make deleted file mode 100644 index ae4493f720..0000000000 --- a/stepmake/stepmake/Executable.make +++ /dev/null @@ -1,3 +0,0 @@ -# Executable.make - -include $(stepdir)/Executable_targets.make diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile new file mode 100644 index 0000000000..72d8b8047a --- /dev/null +++ b/stepmake/stepmake/GNUmakefile @@ -0,0 +1,18 @@ +# title makefile for stepmake + +# subdir level: +# +depth = .. +# + +# descent order into subdirectories: +# +SUBDIRS = +# + +STEPMAKE_TEMPLATES=makedir + + +# bootstrap stepmake: +# +-include $(depth)/make/stepmake.make diff --git a/stepmake/stepmake/Include.make b/stepmake/stepmake/Include.make deleted file mode 100644 index 5566cc802c..0000000000 --- a/stepmake/stepmake/Include.make +++ /dev/null @@ -1,5 +0,0 @@ -# Include.make - - -include $(stepdir)/Files.make - diff --git a/stepmake/stepmake/Install_outfiles.sub.make b/stepmake/stepmake/Install_outfiles.sub.make deleted file mode 100644 index d5f9920448..0000000000 --- a/stepmake/stepmake/Install_outfiles.sub.make +++ /dev/null @@ -1,5 +0,0 @@ -# Initial_outfiles.sub.make - -include $(depth)/make/Stepmake.make -include $(stepdir)/Install_outfiles.make - diff --git a/stepmake/stepmake/Library.make b/stepmake/stepmake/Library.make deleted file mode 100644 index c3a88cf9ec..0000000000 --- a/stepmake/stepmake/Library.make +++ /dev/null @@ -1,3 +0,0 @@ - -include $(stepdir)/Library_vars.make -include $(stepdir)/Library_targets.make diff --git a/stepmake/stepmake/Library_rules.make b/stepmake/stepmake/Library_rules.make deleted file mode 100644 index 1bb8bf6d7f..0000000000 --- a/stepmake/stepmake/Library_rules.make +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/stepmake/stepmake/Makedir.shared.make b/stepmake/stepmake/Makedir.shared.make deleted file mode 100644 index a693a1e16d..0000000000 --- a/stepmake/stepmake/Makedir.shared.make +++ /dev/null @@ -1,3 +0,0 @@ -# stepmake/Makedir.shared.make - -# urg: stuff shared between yodl/lily/stepmake diff --git a/stepmake/stepmake/Makefile b/stepmake/stepmake/Makefile deleted file mode 100644 index b363430b36..0000000000 --- a/stepmake/stepmake/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# title makefile for stepmake - -# subdir level: -# -depth = .. -# - -# descent order into subdirectories: -# -SUBDIRS = -# - -MAKEFILES=Makedir - - -# bootstrap stepmake: -# --include $(depth)/make/Stepmake.make - -# gory hack: stepmake itself is a stepmake package. -default: - rm -f stepmake - ln -s ../stepmake . - rm -f bin - ln -s ../bin . diff --git a/stepmake/stepmake/Metafont_targets.make b/stepmake/stepmake/Metafont_targets.make deleted file mode 100644 index ea30561d83..0000000000 --- a/stepmake/stepmake/Metafont_targets.make +++ /dev/null @@ -1 +0,0 @@ -#empty diff --git a/stepmake/stepmake/Rules.make b/stepmake/stepmake/Rules.make deleted file mode 100644 index 503401be6b..0000000000 --- a/stepmake/stepmake/Rules.make +++ /dev/null @@ -1,2 +0,0 @@ - -include $(stepdir)/Generic_rules.make diff --git a/stepmake/stepmake/STATE-VECTOR b/stepmake/stepmake/STATE-VECTOR deleted file mode 100644 index 845eee732c..0000000000 --- a/stepmake/stepmake/STATE-VECTOR +++ /dev/null @@ -1,19 +0,0 @@ -0.1.26 -0.1.26.jcn1 -0.1.26.hwn1 -0.1.26.jcn2 -0.1.26.jcn3 -0.1.27 -0.1.28 -0.1.29 -0.1.30 -0.1.32 -0.1.33 -0.1.34 -0.1.35 -0.1.36 -0.1.37 -0.1.38 -0.1.39 -0.1.40 -0.1.41 diff --git a/stepmake/stepmake/Targets.make b/stepmake/stepmake/Targets.make deleted file mode 100644 index ef3225b762..0000000000 --- a/stepmake/stepmake/Targets.make +++ /dev/null @@ -1,2 +0,0 @@ - -include $(stepdir)/Generic_targets.make diff --git a/stepmake/stepmake/Variables.make b/stepmake/stepmake/Variables.make deleted file mode 100644 index fdff8195e9..0000000000 --- a/stepmake/stepmake/Variables.make +++ /dev/null @@ -1,2 +0,0 @@ - -include $(stepdir)/Generic_vars.make diff --git a/stepmake/stepmake/c++-files.make b/stepmake/stepmake/c++-files.make new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/stepmake/stepmake/c++-files.make @@ -0,0 +1 @@ + diff --git a/stepmake/stepmake/C++_rules.make b/stepmake/stepmake/c++-rules.make index df26b06ced..83b54258e0 100644 --- a/stepmake/stepmake/C++_rules.make +++ b/stepmake/stepmake/c++-rules.make @@ -18,10 +18,7 @@ $(outdir)/%.cc: %.yy $(outdir)/%.hh: %.yy $(BISON) -d $< mv $<.tab.h $@ - mv $<.tab.c $(basename $@).cc + rm $<.tab.c # if this happens in the wrong order it triggers recompile of the .cc file $(outdir)/%.cc: %.ll $(FLEX) -Cfe -p -p -t $< > $@ -# could be faster: -# $(FLEX) -8 -Cf -t $< > $@ - diff --git a/stepmake/stepmake/c++-targets.make b/stepmake/stepmake/c++-targets.make new file mode 100644 index 0000000000..751260e204 --- /dev/null +++ b/stepmake/stepmake/c++-targets.make @@ -0,0 +1,4 @@ + +$(configheader): $(depth)/config.h + cp $< $@ + diff --git a/stepmake/stepmake/C++_vars.make b/stepmake/stepmake/c++-vars.make index f3d84a90ac..e2667e7e42 100644 --- a/stepmake/stepmake/C++_vars.make +++ b/stepmake/stepmake/c++-vars.make @@ -20,6 +20,9 @@ YY_FILES := $(wildcard *.yy) LL_FILES := $(wildcard *.ll) SOURCE_FILES+=$(YY_FILES) $(CC_FILES) $(INL_FILES) $(TCC_FILES) $(HH_FILES) $(LL_FILES) -OBJECT_FILES+=$(YY_FILES:.yy=.o) $(CC_FILES:.cc=.o) $(LL_FILES:.ll=.o) +O_FILES+=$(addprefix $(outdir)/, $(YY_FILES:.yy=.o) $(CC_FILES:.cc=.o) $(LL_FILES:.ll=.o)) TAGS_FILES += $(TCC_FILES) $(HH_FILES) $(INL_FILES) $(CC_FILES) + +# hmm +configheader=$(outdir)/config.hh diff --git a/stepmake/stepmake/C_rules.make b/stepmake/stepmake/c-rules.make index a2bf496187..a2bf496187 100644 --- a/stepmake/stepmake/C_rules.make +++ b/stepmake/stepmake/c-rules.make diff --git a/stepmake/stepmake/c-targets.make b/stepmake/stepmake/c-targets.make new file mode 100644 index 0000000000..6bdc6921c0 --- /dev/null +++ b/stepmake/stepmake/c-targets.make @@ -0,0 +1,7 @@ +#empty + +$(configheader): $(depth)/config.h + cp $< $@ + +$(configheader): $(depth)/config.h + cp $< $@ diff --git a/stepmake/stepmake/c-vars.make b/stepmake/stepmake/c-vars.make new file mode 100644 index 0000000000..5f9db660a0 --- /dev/null +++ b/stepmake/stepmake/c-vars.make @@ -0,0 +1,26 @@ + +# header files: +H_FILES := $(wildcard *.h) +C_FILES := $(wildcard *.c) +Y_FILES := $(wildcard *.y) +L_FILES := $(wildcard *.l) + +SOURCE_FILES+=$(Y_FILES) $(C_FILES) $(L_FILES) $(H_FILES) + +O_FILES+=$(addprefix $(outdir)/, $(Y_FILES:.y=.o) $(C_FILES:.c=.o) $(L_FILES:.l=.o)) + +TAGS_FILES += C_FILES H_FILES +# C/C++ +# + +ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) + +# compiler: +# +DO_C_COMPILE = $(DODEP) $(CC) -c $(CFLAGS) $(C_OUTPUT_OPTION) +C_OUTPUT_OPTION = -o $@ $< + +CFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) + +# hmm +configheader=$(outdir)/config.h diff --git a/stepmake/stepmake/Documentation_rules.make b/stepmake/stepmake/documentation-rules.make index 6e9828954a..1f6d77316e 100644 --- a/stepmake/stepmake/Documentation_rules.make +++ b/stepmake/stepmake/documentation-rules.make @@ -19,7 +19,6 @@ $(outdir)/%.html: %.data $(depth)/VERSION $(outdir)/%.tex: %.data $(depth)/VERSION $(PYTHON) $(step-bindir)/table-to-html.py --package=$(topdir) -o $@ --latex $< -include $(stepdir)/Yodl_rules.make -include $(stepdir)/Texinfo_rules.make --include $(make-dir)/Docrules.make +include $(stepdir)/yodl-rules.make +include $(stepdir)/texinfo-rules.make diff --git a/stepmake/stepmake/Documentation_targets.make b/stepmake/stepmake/documentation-targets.make index 6c2ec85f2e..58c668d95f 100644 --- a/stepmake/stepmake/Documentation_targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -1,4 +1,5 @@ +default: do-doc: $(OUTTXT_FILES) @@ -26,7 +27,7 @@ doc: do-doc # what to do here? ifneq ($(strip $(INFO_FILES)),) -INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/Install_outfiles.sub.make $@ +INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-outfiles.sub.make $@ $(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES) $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo diff --git a/stepmake/stepmake/Documentation_vars.make b/stepmake/stepmake/documentation-vars.make index 465ab3d5b5..465ab3d5b5 100644 --- a/stepmake/stepmake/Documentation_vars.make +++ b/stepmake/stepmake/documentation-vars.make diff --git a/stepmake/stepmake/Documentation.shared.make b/stepmake/stepmake/documentation.shared.make index 772bf32586..79c67fb8bd 100644 --- a/stepmake/stepmake/Documentation.shared.make +++ b/stepmake/stepmake/documentation.shared.make @@ -1,9 +1,9 @@ -# stepmake/Documentation.shared.make +# stepmake/documentation.shared.make # urg: stuff shared between yodl/lily/stepmake # could/should do this for bin/Makefile make/Makefile too ### below here is shared between lily/yodl/Documentation and topdocs... -include $(stepdir)/Documentation_vars.make -include $(stepdir)/Documentation_rules.make +include $(stepdir)/documentation_vars.make +include $(stepdir)/documentation_rules.make diff --git a/stepmake/stepmake/C++_targets.make b/stepmake/stepmake/executable-rules.make index 1bb8bf6d7f..1bb8bf6d7f 100644 --- a/stepmake/stepmake/C++_targets.make +++ b/stepmake/stepmake/executable-rules.make diff --git a/stepmake/stepmake/Executable_targets.make b/stepmake/stepmake/executable-targets.make index 3feadc553a..3b175b5ad7 100644 --- a/stepmake/stepmake/Executable_targets.make +++ b/stepmake/stepmake/executable-targets.make @@ -20,7 +20,7 @@ localuninstall: uninstallexe installexe: all -$(INSTALL) -d $(bindir) $(foreach a, $(EXECUTABLES), \ - $(INSTALL) -m 755 $(outdir)/$(a)$(DOTEXE) $(bindir)/$(a)$(DOTEXE) && \ + $(INSTALL) -m 755 $(outdir)/$(a) $(bindir)/$(a)$(DOTEXE) && \ strip $(bindir)/$(a)$(DOTEXE) && ) true $(foreach a, $(SEXECUTABLES), \ $(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true diff --git a/stepmake/stepmake/Executable_rules.make b/stepmake/stepmake/executable-vars.make index 1bb8bf6d7f..1bb8bf6d7f 100644 --- a/stepmake/stepmake/Executable_rules.make +++ b/stepmake/stepmake/executable-vars.make diff --git a/stepmake/stepmake/Files.make b/stepmake/stepmake/files.make index 0d42a59707..2c25447e3e 100644 --- a/stepmake/stepmake/Files.make +++ b/stepmake/stepmake/files.make @@ -1,7 +1,6 @@ # Files.make -O_FILES = $(addprefix $(outdir)/,$(OBJECT_FILES)) DEP_FILES := $(wildcard $(outdir)/*.dep) diff --git a/stepmake/stepmake/Generic_rules.make b/stepmake/stepmake/generic-rules.make index 97e210c959..fb05e13e3a 100644 --- a/stepmake/stepmake/Generic_rules.make +++ b/stepmake/stepmake/generic-rules.make @@ -4,6 +4,8 @@ # this is supposed to clear all suffixes: .SUFFIXES: + + $(outdir)/%: %.m4 $(M4) $< > $@ @@ -28,12 +30,3 @@ $(outdir)/%.dvi: $(outdir)/%.latex $(outdir)/%.ps: $(outdir)/%.dvi dvips -ta4 -o $@ $< - -# hmm, always include these, or include via package/make/Rules.make? -include $(stepdir)/Substitute.make -include $(make-dir)/Rules.make - -$(outdir)/%: %.in - rm -f $@ - cat $< | $(sed-atfiles) | $(sed-atvariables) > $@ - diff --git a/stepmake/stepmake/Generic_targets.make b/stepmake/stepmake/generic-targets.make index f701a37f47..413d1b3b10 100644 --- a/stepmake/stepmake/Generic_targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -24,8 +24,6 @@ maintainerclean: $(MAKE) local-maintainerclean $(MAKE) local-distclean -include $(stepdir)/Po.make - # configure: # @@ -77,8 +75,8 @@ Note that all commands recurse into SUBSDIRS\n\ local-help: doc: -# $(MAKE) -C $(depth)/Documentation do-doc - $(MAKE) -C $(depth)/Documentation all +#UGH + true # $(MAKE) -C $(depth)/Documentation all # Ugh. C++ specific. @@ -87,26 +85,22 @@ doc++: -check-state-vector: - if [ "`tail -1 $(state-vector)`" != "$(TOPLEVEL_VERSION)" ]; then\ - echo $(TOPLEVEL_VERSION) >> $(state-vector); \ - fi local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) - mkdir $(distdir)/$(localdir) + mkdir -p $(distdir)/$(localdir) $(LN) $(DIST_FILES) $(distdir)/$(localdir) #UGH UGH . make ifdef doesn't mix with string substitution semantics (late expansion vs. early expansion) # - if [ "$(NON_ESSENTIAL_DIST_FILES)x" != "x" ] ; then \ - $(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir); \ - fi + case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \ + $(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \ + esac - if [ "$(OUT_DIST_FILES)x" != "x" ] ; then \ + case "$(OUT_DIST_FILES)x" in x) ;; *) \ mkdir $(distdir)/$(localdir)/out; \ - $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out; \ - fi + $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out;; \ + esac $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true @@ -157,8 +151,7 @@ installextradoc: WWW: local-WWW $(LOOP) -include $(stepdir)/Package.make -include $(make-dir)/Targets.make +include $(stepdir)/package.make include $(outdir)/dummy.dep $(DEP_FILES) @@ -171,3 +164,10 @@ check: local-check $(LOOP) local-check: + +# ugh. ugh ugh ugh +$(depth)/$(configuration).make: $(depth)/configure + @echo "**************************************" + @echo "configure changed! You should probably reconfigure manually." + @echo "**************************************" + (cd $(depth); ./config.status) diff --git a/stepmake/stepmake/Generic_vars.make b/stepmake/stepmake/generic-vars.make index b10f737237..223c59d093 100644 --- a/stepmake/stepmake/Generic_vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -33,19 +33,8 @@ docout = $(depth)/Documentation/$(outdir) binout = $(depth)/bin/$(outdir) doc-dir = $(depth)/Documentation -make-dir = $(depth)/make po-dir = $(depth)/po -# -c is for copying (now set in config.make) -# INSTALL = $(stepdir)/../bin/install-sh -c - -# user settings: -# -include $(make-dir)/Variables.make -include $(make-dir)/User.make -# - -# urg # sort-out which of these are still needed # $(package)_bindir = $(depth)/bin @@ -63,8 +52,6 @@ rpm-sources = $(release-dir) rpm-build = $(group-dir)/RedHat/BUILD # -# hmm -configheader=$(outdir)/config.hh # need to be defined in local Makefiles: # @@ -82,8 +69,8 @@ TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_ else TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL) endif -state-vector = $(make-dir)/STATE-VECTOR -# + + # clean file lists: # @@ -136,7 +123,7 @@ EXECUTABLES = $(notdir $(EXECUTABLE)) #replace to do stripping of certain objects STRIPDEBUG=true -DIST_FILES=$(EXTRA_DIST_FILES) Makefile $(ALL_SOURCES) +DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) DOCDIR=$(depth)/$(outdir) @@ -147,7 +134,7 @@ endif # substitute $(STRIP) in Site.make if you want stripping DO_STRIP=true - - LOOP=$(foreach i, $(SUBDIRS), $(MAKE) -C $(i) $@ &&) true + +include $(stepdir)/files.make diff --git a/stepmake/stepmake/include.make b/stepmake/stepmake/include.make new file mode 100644 index 0000000000..df45bb7961 --- /dev/null +++ b/stepmake/stepmake/include.make @@ -0,0 +1,6 @@ +# Include.make + + + + + diff --git a/stepmake/stepmake/Install_outfiles.make b/stepmake/stepmake/install-outfiles.make index b4f2539f8c..b4f2539f8c 100644 --- a/stepmake/stepmake/Install_outfiles.make +++ b/stepmake/stepmake/install-outfiles.make diff --git a/stepmake/stepmake/install-outfiles.sub.make b/stepmake/stepmake/install-outfiles.sub.make new file mode 100644 index 0000000000..f406025dad --- /dev/null +++ b/stepmake/stepmake/install-outfiles.sub.make @@ -0,0 +1,5 @@ +# Initial_outfiles.sub.make + +include $(depth)/make/stepmake.make +include $(stepdir)/install_outfiles.make + diff --git a/stepmake/stepmake/Installfiles.make b/stepmake/stepmake/installfiles.make index 58d10e30cf..58d10e30cf 100644 --- a/stepmake/stepmake/Installfiles.make +++ b/stepmake/stepmake/installfiles.make diff --git a/stepmake/stepmake/Intlrules.make b/stepmake/stepmake/intlrules.make index 41a4421f86..8a44f880b3 100644 --- a/stepmake/stepmake/Intlrules.make +++ b/stepmake/stepmake/intlrules.make @@ -3,5 +3,5 @@ LIBINTL=$(outdir)/libintl.a check-lib-intl: $(MAKE) -C $(depth)/intl lib -include $(stepdir)/C.make +include $(stepdir)/c.make diff --git a/stepmake/stepmake/Executable_vars.make b/stepmake/stepmake/library-rules.make index 1bb8bf6d7f..1bb8bf6d7f 100644 --- a/stepmake/stepmake/Executable_vars.make +++ b/stepmake/stepmake/library-rules.make diff --git a/stepmake/stepmake/Library_targets.make b/stepmake/stepmake/library-targets.make index f032aa5425..f032aa5425 100644 --- a/stepmake/stepmake/Library_targets.make +++ b/stepmake/stepmake/library-targets.make diff --git a/stepmake/stepmake/Library_vars.make b/stepmake/stepmake/library-vars.make index c749adb538..037f8ae805 100644 --- a/stepmake/stepmake/Library_vars.make +++ b/stepmake/stepmake/library-vars.make @@ -12,7 +12,7 @@ AR = ar AR_COMMAND = $(AR) $(ARFLAGS) $@ # thanks to Nelson Beebe for this trick. -RANLIB_COMMAND=$(RANLIB) || $(AR) || true +RANLIB_COMMAND=$(RANLIB) $@ || $(AR) ts $@ || true # linker: LIBRARY = $(outdir)/library.a diff --git a/stepmake/stepmake/C_targets.make b/stepmake/stepmake/makedir-rules.make index ea30561d83..ea30561d83 100644 --- a/stepmake/stepmake/C_targets.make +++ b/stepmake/stepmake/makedir-rules.make diff --git a/stepmake/stepmake/Makedir_targets.make b/stepmake/stepmake/makedir-targets.make index 341229447c..341229447c 100644 --- a/stepmake/stepmake/Makedir_targets.make +++ b/stepmake/stepmake/makedir-targets.make diff --git a/stepmake/stepmake/Makedir_vars.make b/stepmake/stepmake/makedir-vars.make index adb1733f4c..11387ce235 100644 --- a/stepmake/stepmake/Makedir_vars.make +++ b/stepmake/stepmake/makedir-vars.make @@ -1,6 +1,6 @@ -# stepmake/Makedir.shared.make +# stepmake/makedir.shared.make # urg: stuff shared between yodl/lily/stepmake MAKE_FILES := $(wildcard *.make) @@ -10,7 +10,7 @@ SPEC_FILES:= $(wildcard *.spec.in) OUTSPEC_FILES=$(addprefix $(outdir)/,$(basename $(SPEC_FILES))) OUT_DIST_FILES= $(strip $(OUTLSM_FILES) $(OUTSPEC_FILES)) -EXTRA_DIST_FILES += $(state-vector) $(MAKE_FILES) +EXTRA_DIST_FILES += $(MAKE_FILES) # these two outdir FILES are distributed, since they make sense to have # without running configure and make. @@ -19,9 +19,4 @@ AT_FILES = $(BLURBS) # at-dir = $(doc-dir)/ at-ext = .in -# is this still used? -rpmdocs=BUGS TODO NEWS DEDICATION ANNOUNCE README -rpmdvis=$(rpmmudocs:.doc=.dvi) -rpmexamples= $(addprefix input/, $(notdir $(shell ls $(depth)/input/*.ly))) - diff --git a/stepmake/stepmake/Manual.make b/stepmake/stepmake/manual.make index 0e6206dabf..0e6206dabf 100644 --- a/stepmake/stepmake/Manual.make +++ b/stepmake/stepmake/manual.make diff --git a/stepmake/stepmake/Metafont_rules.make b/stepmake/stepmake/metafont-rules.make index 304512da5e..304512da5e 100644 --- a/stepmake/stepmake/Metafont_rules.make +++ b/stepmake/stepmake/metafont-rules.make diff --git a/stepmake/stepmake/Makedir_rules.make b/stepmake/stepmake/metafont-targets.make index ea30561d83..ea30561d83 100644 --- a/stepmake/stepmake/Makedir_rules.make +++ b/stepmake/stepmake/metafont-targets.make diff --git a/stepmake/stepmake/Metafont_vars.make b/stepmake/stepmake/metafont-vars.make index 67600b84bf..67600b84bf 100644 --- a/stepmake/stepmake/Metafont_vars.make +++ b/stepmake/stepmake/metafont-vars.make diff --git a/stepmake/stepmake/Package.make b/stepmake/stepmake/package.make index d0d29f11e1..d0d29f11e1 100644 --- a/stepmake/stepmake/Package.make +++ b/stepmake/stepmake/package.make diff --git a/stepmake/stepmake/Po_rules.make b/stepmake/stepmake/po-rules.make index ccff7a15f3..ccff7a15f3 100644 --- a/stepmake/stepmake/Po_rules.make +++ b/stepmake/stepmake/po-rules.make diff --git a/stepmake/stepmake/Po.make b/stepmake/stepmake/po-targets.make index c5e22d1f29..f9307f8464 100644 --- a/stepmake/stepmake/Po.make +++ b/stepmake/stepmake/po-targets.make @@ -1,5 +1,6 @@ + #### #### UGH! new-po: diff --git a/stepmake/stepmake/po-vars.make b/stepmake/stepmake/po-vars.make new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/stepmake/stepmake/po-vars.make diff --git a/stepmake/stepmake/Pod_rules.make b/stepmake/stepmake/pod-rules.make index dd5b7ccd3d..dd5b7ccd3d 100644 --- a/stepmake/stepmake/Pod_rules.make +++ b/stepmake/stepmake/pod-rules.make diff --git a/stepmake/stepmake/Script_rules.make b/stepmake/stepmake/script-rules.make index 1dca17b995..1dca17b995 100644 --- a/stepmake/stepmake/Script_rules.make +++ b/stepmake/stepmake/script-rules.make diff --git a/stepmake/stepmake/Script_targets.make b/stepmake/stepmake/script-targets.make index 1ba75cdf04..1ba75cdf04 100644 --- a/stepmake/stepmake/Script_targets.make +++ b/stepmake/stepmake/script-targets.make diff --git a/stepmake/stepmake/Script_vars.make b/stepmake/stepmake/script-vars.make index ef705ba066..ef705ba066 100644 --- a/stepmake/stepmake/Script_vars.make +++ b/stepmake/stepmake/script-vars.make diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make new file mode 100644 index 0000000000..6faf105a38 --- /dev/null +++ b/stepmake/stepmake/substitute-rules.make @@ -0,0 +1,5 @@ + +$(outdir)/%: %.in + rm -f $@ + cat $< | $(sed-atfiles) | $(sed-atvariables) > $@ + diff --git a/stepmake/stepmake/substitute-targets.make b/stepmake/stepmake/substitute-targets.make new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/stepmake/stepmake/substitute-targets.make diff --git a/stepmake/stepmake/Substitute.make b/stepmake/stepmake/substitute-vars.make index d4f1840898..823ada2995 100644 --- a/stepmake/stepmake/Substitute.make +++ b/stepmake/stepmake/substitute-vars.make @@ -1,7 +1,5 @@ # Substitute.make -include $(make-dir)/Substitute.make - sed-endline = sed 's!$$!\\!' sed-newline = sed 's!$$!\n!' sed-quotes = sed "s!\'!\\\&!g" diff --git a/stepmake/stepmake/Template.make b/stepmake/stepmake/template.make index 739a02af74..45ae61eec6 100644 --- a/stepmake/stepmake/Template.make +++ b/stepmake/stepmake/template.make @@ -29,7 +29,7 @@ EXTRA_DIST_FILES = # bootstrap stepmake: # -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make # # module compile settings: (not generally needed!) diff --git a/stepmake/stepmake/Texinfo_rules.make b/stepmake/stepmake/texinfo-rules.make index a1f223b4c4..a1f223b4c4 100644 --- a/stepmake/stepmake/Texinfo_rules.make +++ b/stepmake/stepmake/texinfo-rules.make diff --git a/stepmake/stepmake/toplevel-rules.make b/stepmake/stepmake/toplevel-rules.make new file mode 100644 index 0000000000..60a25993d6 --- /dev/null +++ b/stepmake/stepmake/toplevel-rules.make @@ -0,0 +1,5 @@ +# -*-Makefile-*- +# title Toplevel_rules.make + +# empty + diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/toplevel-targets.make index 450eaf5571..cf5b0a77bf 100644 --- a/stepmake/stepmake/Toplevel.make +++ b/stepmake/stepmake/toplevel-targets.make @@ -1,11 +1,5 @@ # -*-Makefile-*- -# title Toplevel.make - -# override Variables.make: -# do not dist ./Makefile (is copied from make/Toplevel.make) -# -DIST_FILES := $(EXTRA_DIST_FILES) -# +# title Toplevel_targets.make local-dist: configure @@ -16,27 +10,15 @@ local-distclean: local-maintainerclean: rm -f configure -Makefile: make/Toplevel.make.in +GNUmakefile: make/toplevel.make.in chmod +w $@ echo "# WARNING WARNING WARNING WARNING" > $@ echo "# do not edit! this is generated from make/Toplevel.make.in" >> $@ cat $< >> $@ chmod -w $@ -htmldoc: - $(MAKE) CONFIGSUFFIX='www' local-WWW - $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW - rm -f `find . -name \*.html~ -print` - -ln -f $(depth)/$(distname).diff.gz out-www - find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist - - tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` $(shell ls *.gif (ERRORLOG)) `ls out-www/$(distname).diff.gz $(ERRORLOG)` - - - -# if you fix this, please fix yodl too! -check-top-web: - $(MAKE) -C Documentation/topdocs WWW +aclocal.m4: $(stepdir)/../aclocal.m4 + cp $< $@ local-WWW: #index.html @@ -47,8 +29,7 @@ index.html: check-top-web NEWS WWW-clean: $(MAKE) CONFIGSUFFIX='www' clean - -dist: check-state-vector +dist: rm -rf $(distdir) $(MAKE) local-dist $(distdir) chmod -R a+r $(distdir) @@ -63,3 +44,4 @@ local-help: @echo -e "\ dist roll tarball: $(outdir)/$(package)-$(TOPLEVEL_VERSION).tar.gz\n" + diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make new file mode 100644 index 0000000000..9c642cfa25 --- /dev/null +++ b/stepmake/stepmake/toplevel-vars.make @@ -0,0 +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) +# + diff --git a/stepmake/stepmake/Yodl_rules.make b/stepmake/stepmake/yodl-rules.make index 34542d3f2b..34542d3f2b 100644 --- a/stepmake/stepmake/Yodl_rules.make +++ b/stepmake/stepmake/yodl-rules.make diff --git a/stepmake/stepmake/yolily-debian-rules.make b/stepmake/stepmake/yolily-debian-rules.make new file mode 100644 index 0000000000..74cd7be4a6 --- /dev/null +++ b/stepmake/stepmake/yolily-debian-rules.make @@ -0,0 +1,3 @@ +# Yolily_Debian_rules.make + +#empty diff --git a/stepmake/stepmake/yolily-debian-targets.make b/stepmake/stepmake/yolily-debian-targets.make new file mode 100644 index 0000000000..9c19eb29db --- /dev/null +++ b/stepmake/stepmake/yolily-debian-targets.make @@ -0,0 +1,16 @@ +# Yolily_Debian_targets.make + +default: $(OUTCONF_FILES) + + +$(outdir)/%: % + rm -f $@ + ln $< $@ + +$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS)) + +$(outdir)/%: $(doc-dir)/%.in + rm -f $@ + cat $< | sed 's%^% %' > $@ + +localdist: default diff --git a/stepmake/stepmake/yolily-debian-vars.make b/stepmake/stepmake/yolily-debian-vars.make new file mode 100644 index 0000000000..924bf91645 --- /dev/null +++ b/stepmake/stepmake/yolily-debian-vars.make @@ -0,0 +1,4 @@ +# Yolily_Debian_vars.make + +#empty + diff --git a/stepmake/stepmake/yolily-topdoc-rules.make b/stepmake/stepmake/yolily-topdoc-rules.make new file mode 100644 index 0000000000..5f02ccae0c --- /dev/null +++ b/stepmake/stepmake/yolily-topdoc-rules.make @@ -0,0 +1,4 @@ +# Yolily_topdoc_rules.make + +# empty + diff --git a/Documentation/topdocs/Makefile b/stepmake/stepmake/yolily-topdoc-targets.make index 53a8a262d0..447b7e4316 100644 --- a/Documentation/topdocs/Makefile +++ b/stepmake/stepmake/yolily-topdoc-targets.make @@ -1,22 +1,7 @@ -# Documentation/topdocs/Makefile - -depth = ../.. - -MAKEFILES=Documentation -LOCALMAKEFILES=Lilypond -BLURBS=BLURB COPERTINA FLAPTEKST - -TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) - - -include $(depth)/make/Stepmake.make +# Yolily_topdoc_targets.make default: do-doc - -# INFO_FILES = $(outdir)/$(package).info - - # urg $(outdir)/%.html: %.yo $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@.in $< diff --git a/stepmake/stepmake/yolily-topdoc-vars.make b/stepmake/stepmake/yolily-topdoc-vars.make new file mode 100644 index 0000000000..5ace65177d --- /dev/null +++ b/stepmake/stepmake/yolily-topdoc-vars.make @@ -0,0 +1,6 @@ +# Yolily_topdoc_vars.make + +# INFO_FILES = $(outdir)/$(package).info + +TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) + diff --git a/stepmake/stepmake/yolily-toplevel-rules.make b/stepmake/stepmake/yolily-toplevel-rules.make new file mode 100644 index 0000000000..b21868ec72 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-rules.make @@ -0,0 +1,4 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_rules.make + +# empty diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make new file mode 100644 index 0000000000..b451793c52 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-targets.make @@ -0,0 +1,27 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_targets.make + +local-dist: do-top-doc + +$(package-icon): + $(MAKE) -C Documentation/pictures icon + +do-top-doc: + -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" copy-to-top + +$(README_TXT_FILES): do-top-doc + + +htmldoc: + $(MAKE) CONFIGSUFFIX='www' local-WWW + $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW + rm -f `find . -name \*.html~ -print` + find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist + -ln -f $(depth)/$(distname).diff.gz out-www + tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)` index.html + + +# if you fix this, please fix yodl too! +check-top-web: + $(MAKE) -C Documentation/topdocs WWW + diff --git a/stepmake/stepmake/yolily-toplevel-vars.make b/stepmake/stepmake/yolily-toplevel-vars.make new file mode 100644 index 0000000000..063229a4c4 --- /dev/null +++ b/stepmake/stepmake/yolily-toplevel-vars.make @@ -0,0 +1,5 @@ +# -*-Makefile-*- +# title Yolily_Toplevel_vars.make + +#empty + diff --git a/test/Makefile b/test/GNUmakefile index e6215a3732..f4392fb708 100644 --- a/test/Makefile +++ b/test/GNUmakefile @@ -7,9 +7,9 @@ NAME = lily-test MODULE_NAME = lily-test MODULE_CXXFLAGS = -I$(depth)/flower/include -I$(depth)/flower -I$(depth)/lily/include -I$(depth)/lily -MAKEFILES=C++ +STEPMAKE_TEMPLATES=c++ -include $(depth)/make/Stepmake.make +include $(depth)/make/stepmake.make # default: $(EXECUTABLE) diff --git a/tex/Makefile b/tex/GNUmakefile index e38e51491e..16b47023ad 100644 --- a/tex/Makefile +++ b/tex/GNUmakefile @@ -9,6 +9,6 @@ EXTRA_DIST_FILES = $(TEX_FILES) INSTALLATION_DIR=$(TEXDIR)/lilypond INSTALLATION_FILES=$(TEX_FILES) -include $(depth)/make/Stepmake.make -include $(stepdir)/Installfiles.make +include $(depth)/make/stepmake.make +include $(stepdir)/installfiles.make |