]> git.donarmstrong.com Git - lilypond.git/commitdiff
release: 1.0.4 release/1.0.4
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 24 Aug 1998 10:55:09 +0000 (12:55 +0200)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 24 Aug 1998 10:55:09 +0000 (12:55 +0200)
298 files changed:
Documentation/GNUmakefile [new file with mode: 0644]
Documentation/Makefile [deleted file]
Documentation/man/GNUmakefile [new file with mode: 0644]
Documentation/man/Makefile [deleted file]
Documentation/ntweb/GNUmakefile [new file with mode: 0644]
Documentation/ntweb/index.yo [new file with mode: 0644]
Documentation/pictures/GNUmakefile [new file with mode: 0644]
Documentation/pictures/Makefile [deleted file]
Documentation/tex/GNUmakefile [new file with mode: 0644]
Documentation/tex/Makefile [deleted file]
Documentation/topdocs/GNUmakefile [new file with mode: 0644]
Documentation/topdocs/Makefile [deleted file]
Documentation/topdocs/README.yo
Documentation/topdocs/index.yo
NEWS
README.txt
TODO
VERSION
aclocal.m4
buildscripts/GNUmakefile [new file with mode: 0644]
buildscripts/Makefile [deleted file]
configure
configure.in
debian/GNUmakefile [new file with mode: 0644]
debian/Makefile [deleted file]
flower/GNUmakefile [new file with mode: 0644]
flower/Makefile [deleted file]
flower/include/GNUmakefile [new file with mode: 0644]
flower/include/Makefile [deleted file]
init/GNUmakefile [new file with mode: 0644]
init/Makefile [deleted file]
init/property.ly
input/GNUmakefile [new file with mode: 0644]
input/Makefile [deleted file]
input/bugs/GNUmakefile [new file with mode: 0644]
input/bugs/Makefile [deleted file]
input/test/GNUmakefile [new file with mode: 0644]
input/test/Makefile [deleted file]
intl/GNUmakefile [new file with mode: 0644]
intl/Makefile [deleted file]
intl/Makefile.in.dist
lib/GNUmakefile [new file with mode: 0644]
lib/Makefile [deleted file]
lib/include/GNUmakefile [new file with mode: 0644]
lib/include/Makefile [deleted file]
lily/GNUmakefile [new file with mode: 0644]
lily/Makefile [deleted file]
lily/VERSION
lily/include/GNUmakefile [new file with mode: 0644]
lily/include/Makefile [deleted file]
lily/include/text-def.hh
lily/lyric-engraver.cc
lily/parser.yy
lily/script-engraver.cc
lily/text-def.cc
make/Docrules.make [deleted file]
make/GNUmakefile [new file with mode: 0644]
make/Lilypond_rules.make [deleted file]
make/Lilypond_targets.make [deleted file]
make/Lilypond_vars.make [deleted file]
make/Makefile [deleted file]
make/Mudela_rules.make [deleted file]
make/Mutopia.make [deleted file]
make/Mutopia_rules.make [deleted file]
make/Mutopia_targets.make [deleted file]
make/Mutopia_vars.make [deleted file]
make/Rules.make [deleted file]
make/STATE-VECTOR [deleted file]
make/Stepmake.make [deleted file]
make/Substitute.make [deleted file]
make/Targets.make [deleted file]
make/Toplevel.make.in [deleted file]
make/Toplevel_version.make [deleted file]
make/User.make [deleted file]
make/Variables.make [deleted file]
make/docrules.make [new file with mode: 0644]
make/generic-rules.make [new file with mode: 0644]
make/generic-targets.make [new file with mode: 0644]
make/generic-vars.make [new file with mode: 0644]
make/lilypond-rules.make [new file with mode: 0644]
make/lilypond-targets.make [new file with mode: 0644]
make/lilypond-vars.make [new file with mode: 0644]
make/mudela-rules.make [new file with mode: 0644]
make/mudela-targets.make [new file with mode: 0644]
make/mudela-vars.make [new file with mode: 0644]
make/mutopia-rules.make [new file with mode: 0644]
make/mutopia-targets.make [new file with mode: 0644]
make/mutopia-vars.make [new file with mode: 0644]
make/mutopia.make [new file with mode: 0644]
make/out/lelievijver.lsm
make/out/lilypond.lsm
make/out/lilypond.spec
make/stepmake.make [new file with mode: 0644]
make/substitute.make [new file with mode: 0644]
make/toplevel-version.make [new file with mode: 0644]
make/toplevel.make.in [new file with mode: 0644]
mf/GNUmakefile [new file with mode: 0644]
mf/Makefile [deleted file]
mf/feta-params.mf
mi2mu/GNUmakefile [new file with mode: 0644]
mi2mu/Makefile [deleted file]
mi2mu/include/GNUmakefile [new file with mode: 0644]
mi2mu/include/Makefile [deleted file]
mutopia/Coriolan/GNUmakefile [new file with mode: 0644]
mutopia/Coriolan/Makefile [deleted file]
mutopia/GNUmakefile [new file with mode: 0644]
mutopia/J.S.Bach/GNUmakefile [new file with mode: 0644]
mutopia/J.S.Bach/Makefile [deleted file]
mutopia/J.S.Bach/Petites-Preludes/GNUmakefile [new file with mode: 0644]
mutopia/J.S.Bach/Petites-Preludes/Makefile [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/Makefile [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly [deleted file]
mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly [new file with mode: 0644]
mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly [deleted file]
mutopia/Makefile [deleted file]
mutopia/W.A.Mozart/GNUmakefile [new file with mode: 0644]
mutopia/W.A.Mozart/Makefile [deleted file]
po/GNUmakefile [new file with mode: 0644]
po/Makefile [deleted file]
scripts/GNUmakefile [new file with mode: 0644]
scripts/Makefile [deleted file]
scripts/ly2dvi.sh
scripts/ly2dvi32.py
scripts/mudela-book.py
stepmake/Documentation/GNUmakefile [new file with mode: 0644]
stepmake/Documentation/Makefile [deleted file]
stepmake/Documentation/topdocs/GNUmakefile [new file with mode: 0644]
stepmake/Documentation/topdocs/Makefile [deleted file]
stepmake/NEWS
stepmake/VERSION
stepmake/aclocal.m4
stepmake/bin/GNUmakefile [new file with mode: 0644]
stepmake/bin/Makefile [deleted file]
stepmake/configure
stepmake/make/GNUmakefile [new file with mode: 0644]
stepmake/make/Makefile [deleted file]
stepmake/make/Rules.make [deleted file]
stepmake/make/STATE-VECTOR [deleted file]
stepmake/make/Stepmake.make [deleted file]
stepmake/make/Substitute.make [deleted file]
stepmake/make/Targets.make [deleted file]
stepmake/make/Toplevel.make.in [deleted file]
stepmake/make/Toplevel_version.make [deleted file]
stepmake/make/User.make [deleted file]
stepmake/make/Variables.make [deleted file]
stepmake/make/generic-rules.make [new file with mode: 0644]
stepmake/make/generic-targets.make [new file with mode: 0644]
stepmake/make/generic-vars.make [new file with mode: 0644]
stepmake/make/out/stepmake.lsm
stepmake/make/out/stepmake.spec
stepmake/make/stepmake.make [new file with mode: 0644]
stepmake/make/substitute.make [new file with mode: 0644]
stepmake/make/toplevel-version.make [new file with mode: 0644]
stepmake/make/toplevel.make.in [new file with mode: 0644]
stepmake/make/user.make [new file with mode: 0644]
stepmake/stepmake/C++.make [deleted file]
stepmake/stepmake/C++_files.make [deleted file]
stepmake/stepmake/C++_rules.make [deleted file]
stepmake/stepmake/C++_targets.make [deleted file]
stepmake/stepmake/C++_vars.make [deleted file]
stepmake/stepmake/C.make [deleted file]
stepmake/stepmake/C_rules.make [deleted file]
stepmake/stepmake/C_targets.make [deleted file]
stepmake/stepmake/C_vars.make [deleted file]
stepmake/stepmake/Documentation.shared.make [deleted file]
stepmake/stepmake/Documentation_rules.make [deleted file]
stepmake/stepmake/Documentation_targets.make [deleted file]
stepmake/stepmake/Documentation_vars.make [deleted file]
stepmake/stepmake/Executable.make [deleted file]
stepmake/stepmake/Executable_rules.make [deleted file]
stepmake/stepmake/Executable_targets.make [deleted file]
stepmake/stepmake/Executable_vars.make [deleted file]
stepmake/stepmake/Files.make [deleted file]
stepmake/stepmake/GNUmakefile [new file with mode: 0644]
stepmake/stepmake/Generic_rules.make [deleted file]
stepmake/stepmake/Generic_targets.make [deleted file]
stepmake/stepmake/Generic_vars.make [deleted file]
stepmake/stepmake/Include.make [deleted file]
stepmake/stepmake/Install_outfiles.make [deleted file]
stepmake/stepmake/Install_outfiles.sub.make [deleted file]
stepmake/stepmake/Installfiles.make [deleted file]
stepmake/stepmake/Intlrules.make [deleted file]
stepmake/stepmake/Library.make [deleted file]
stepmake/stepmake/Library_rules.make [deleted file]
stepmake/stepmake/Library_targets.make [deleted file]
stepmake/stepmake/Library_vars.make [deleted file]
stepmake/stepmake/Makedir.shared.make [deleted file]
stepmake/stepmake/Makedir_rules.make [deleted file]
stepmake/stepmake/Makedir_targets.make [deleted file]
stepmake/stepmake/Makedir_vars.make [deleted file]
stepmake/stepmake/Makefile [deleted file]
stepmake/stepmake/Manual.make [deleted file]
stepmake/stepmake/Metafont_rules.make [deleted file]
stepmake/stepmake/Metafont_targets.make [deleted file]
stepmake/stepmake/Metafont_vars.make [deleted file]
stepmake/stepmake/Package.make [deleted file]
stepmake/stepmake/Po.make [deleted file]
stepmake/stepmake/Po_rules.make [deleted file]
stepmake/stepmake/Pod_rules.make [deleted file]
stepmake/stepmake/Rules.make [deleted file]
stepmake/stepmake/STATE-VECTOR [deleted file]
stepmake/stepmake/Script_rules.make [deleted file]
stepmake/stepmake/Script_targets.make [deleted file]
stepmake/stepmake/Script_vars.make [deleted file]
stepmake/stepmake/Substitute.make [deleted file]
stepmake/stepmake/Targets.make [deleted file]
stepmake/stepmake/Template.make [deleted file]
stepmake/stepmake/Texinfo_rules.make [deleted file]
stepmake/stepmake/Toplevel.make [deleted file]
stepmake/stepmake/Variables.make [deleted file]
stepmake/stepmake/Yodl_rules.make [deleted file]
stepmake/stepmake/c++-files.make [new file with mode: 0644]
stepmake/stepmake/c++-rules.make [new file with mode: 0644]
stepmake/stepmake/c++-targets.make [new file with mode: 0644]
stepmake/stepmake/c++-vars.make [new file with mode: 0644]
stepmake/stepmake/c-rules.make [new file with mode: 0644]
stepmake/stepmake/c-targets.make [new file with mode: 0644]
stepmake/stepmake/c-vars.make [new file with mode: 0644]
stepmake/stepmake/documentation-rules.make [new file with mode: 0644]
stepmake/stepmake/documentation-targets.make [new file with mode: 0644]
stepmake/stepmake/documentation-vars.make [new file with mode: 0644]
stepmake/stepmake/documentation.shared.make [new file with mode: 0644]
stepmake/stepmake/executable-rules.make [new file with mode: 0644]
stepmake/stepmake/executable-targets.make [new file with mode: 0644]
stepmake/stepmake/executable-vars.make [new file with mode: 0644]
stepmake/stepmake/files.make [new file with mode: 0644]
stepmake/stepmake/generic-rules.make [new file with mode: 0644]
stepmake/stepmake/generic-targets.make [new file with mode: 0644]
stepmake/stepmake/generic-vars.make [new file with mode: 0644]
stepmake/stepmake/include.make [new file with mode: 0644]
stepmake/stepmake/install-outfiles.make [new file with mode: 0644]
stepmake/stepmake/install-outfiles.sub.make [new file with mode: 0644]
stepmake/stepmake/installfiles.make [new file with mode: 0644]
stepmake/stepmake/intlrules.make [new file with mode: 0644]
stepmake/stepmake/library-rules.make [new file with mode: 0644]
stepmake/stepmake/library-targets.make [new file with mode: 0644]
stepmake/stepmake/library-vars.make [new file with mode: 0644]
stepmake/stepmake/makedir-rules.make [new file with mode: 0644]
stepmake/stepmake/makedir-targets.make [new file with mode: 0644]
stepmake/stepmake/makedir-vars.make [new file with mode: 0644]
stepmake/stepmake/manual.make [new file with mode: 0644]
stepmake/stepmake/metafont-rules.make [new file with mode: 0644]
stepmake/stepmake/metafont-targets.make [new file with mode: 0644]
stepmake/stepmake/metafont-vars.make [new file with mode: 0644]
stepmake/stepmake/package.make [new file with mode: 0644]
stepmake/stepmake/po-rules.make [new file with mode: 0644]
stepmake/stepmake/po-targets.make [new file with mode: 0644]
stepmake/stepmake/po-vars.make [new file with mode: 0644]
stepmake/stepmake/pod-rules.make [new file with mode: 0644]
stepmake/stepmake/script-rules.make [new file with mode: 0644]
stepmake/stepmake/script-targets.make [new file with mode: 0644]
stepmake/stepmake/script-vars.make [new file with mode: 0644]
stepmake/stepmake/substitute-rules.make [new file with mode: 0644]
stepmake/stepmake/substitute-targets.make [new file with mode: 0644]
stepmake/stepmake/substitute-vars.make [new file with mode: 0644]
stepmake/stepmake/template.make [new file with mode: 0644]
stepmake/stepmake/texinfo-rules.make [new file with mode: 0644]
stepmake/stepmake/toplevel-rules.make [new file with mode: 0644]
stepmake/stepmake/toplevel-targets.make [new file with mode: 0644]
stepmake/stepmake/toplevel-vars.make [new file with mode: 0644]
stepmake/stepmake/yodl-rules.make [new file with mode: 0644]
stepmake/stepmake/yolily-debian-rules.make [new file with mode: 0644]
stepmake/stepmake/yolily-debian-targets.make [new file with mode: 0644]
stepmake/stepmake/yolily-debian-vars.make [new file with mode: 0644]
stepmake/stepmake/yolily-topdoc-rules.make [new file with mode: 0644]
stepmake/stepmake/yolily-topdoc-targets.make [new file with mode: 0644]
stepmake/stepmake/yolily-topdoc-vars.make [new file with mode: 0644]
stepmake/stepmake/yolily-toplevel-rules.make [new file with mode: 0644]
stepmake/stepmake/yolily-toplevel-targets.make [new file with mode: 0644]
stepmake/stepmake/yolily-toplevel-vars.make [new file with mode: 0644]
test/GNUmakefile [new file with mode: 0644]
test/Makefile [deleted file]
tex/GNUmakefile [new file with mode: 0644]
tex/Makefile [deleted file]

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
new file mode 100644 (file)
index 0000000..361a15f
--- /dev/null
@@ -0,0 +1,22 @@
+# Documentation/Makefile
+
+depth = ..
+
+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 
+
+BLURBS=BLURB COPERTINA FLAPTEKST
+OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
+
+include $(depth)/make/stepmake.make 
+
+default: do-doc
+
+# INFO_FILES = $(outdir)/$(package).info
+
+texinfo: $(OUTTEXINFO_FILES)
+
diff --git a/Documentation/Makefile b/Documentation/Makefile
deleted file mode 100644 (file)
index 25cf1d4..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Documentation/Makefile
-
-depth = ..
-
-NAME = Documentation
-SUBDIRS=man tex pictures topdocs
-MAKEFILES=Documentation
-README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1
-
-EXTRA_DIST_FILES = gnu-music-history TODO 
-
-BLURBS=BLURB COPERTINA FLAPTEKST
-OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
-
-include $(depth)/make/Stepmake.make 
-
-default: do-doc
-
-# INFO_FILES = $(outdir)/$(package).info
-
-texinfo: $(OUTTEXINFO_FILES)
-
diff --git a/Documentation/man/GNUmakefile b/Documentation/man/GNUmakefile
new file mode 100644 (file)
index 0000000..efac06a
--- /dev/null
@@ -0,0 +1,30 @@
+# Documentation/man/Makefile
+
+depth = ../..
+
+STEPMAKE_TEMPLATES=documentation
+SECTION=1
+MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(TEXINFO_FILES) .texinfo)))
+MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES) .yo)))
+
+OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
+
+OUT_DIST_FILES += $(MANGROFF)
+
+include $(depth)/make/stepmake.make 
+
+default: $(MANGROFF)
+
+texinfo: $(OUTTEXINFO_FILES)
+
+
+
+INSTALLATION_OUT_FILES=$(MANGROFF)
+INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION)
+
+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) \
+         | sed "s!$(outdir)/!!g" > $(outdir)/index.html
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
diff --git a/Documentation/man/Makefile b/Documentation/man/Makefile
deleted file mode 100644 (file)
index 498473b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# Documentation/man/Makefile
-
-depth = ../..
-
-MAKEFILES=Documentation
-SECTION=1
-MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(TEXINFO_FILES) .texinfo)))
-MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES) .yo)))
-
-OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
-
-OUT_DIST_FILES += $(MANGROFF)
-
-include $(depth)/make/Stepmake.make 
-
-default: $(MANGROFF)
-
-texinfo: $(OUTTEXINFO_FILES)
-
-
-
-INSTALLATION_OUT_FILES=$(MANGROFF)
-INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION)
-
-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) \
-         | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile
new file mode 100644 (file)
index 0000000..709c787
--- /dev/null
@@ -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 (file)
index 0000000..407e3d5
--- /dev/null
@@ -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/GNUmakefile b/Documentation/pictures/GNUmakefile
new file mode 100644 (file)
index 0000000..a4fcedd
--- /dev/null
@@ -0,0 +1,16 @@
+depth = ../..
+
+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
+
+gifs: $(OUTGIF_FILES)
+
+local-WWW: $(OUTGIF_FILES)
+
+icon: $(outdir)/lelie_icon.gif
+       cp $< $(depth)/$(outdir)/$(package)-icon.gif
diff --git a/Documentation/pictures/Makefile b/Documentation/pictures/Makefile
deleted file mode 100644 (file)
index e1826fa..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-depth = ../..
-
-MAKEFILES=Documentation
-XPM_FILES=$(wildcard *.xpm)
-OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
-
-EXTRA_DIST_FILES= $(XPM_FILES)
-
-include $(depth)/make/Stepmake.make
-
-gifs: $(OUTGIF_FILES)
-
-local-WWW: $(OUTGIF_FILES)
-
-icon: $(outdir)/lelie_icon.gif
-       cp $< $(depth)/$(outdir)/$(package)-icon.gif
diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
new file mode 100644 (file)
index 0000000..07b68a5
--- /dev/null
@@ -0,0 +1,52 @@
+# Documentation/tex/Makefile
+
+depth=../..
+
+DATA_FILES = $(wildcard *.data)
+datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
+DOC_FILES = $(wildcard *.doc)
+DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
+OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
+EL_FILES = $(wildcard *.el)
+BIB_FILES= $(wildcard *.bib)
+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)
+
+STEPMAKE_TEMPLATES=documentation
+LOCALSTEPMAKE_TEMPLATES=lilypond mudela
+
+
+include $(depth)/make/stepmake.make 
+
+dvi: $(DVI_FILES)
+
+ps: $(PS_FILES)
+
+# urg
+default:
+
+GENHTMLS = engraving colorado vocabulary computer-notation
+OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
+
+
+$(outdir)/glossary.dvi: $(outdir)/vocabulary.tex 
+$(outdir)/glossary.html: $(OUTGENHTMLS)
+
+local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
+       $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \
+         $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) \
+         | sed "s!$(outdir)/!!g" > $(outdir)/index.html
+         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
+
+$(outdir)/%.bib: %.bib
+       ln -f $< $@
+
+$(outdir)/%.html: %.bib
+       bib2html $< $@
+
+# Yeah right: 
+# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
+
+#out/%: $(outdir)/%
+#      cp -f $< $@
diff --git a/Documentation/tex/Makefile b/Documentation/tex/Makefile
deleted file mode 100644 (file)
index 4cc34a4..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Documentation/tex/Makefile
-
-depth=../..
-
-DATA_FILES = $(wildcard *.data)
-datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
-DOC_FILES = $(wildcard *.doc)
-DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
-OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
-EL_FILES = $(wildcard *.el)
-BIB_FILES= $(wildcard *.bib)
-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
-
-
-include $(depth)/make/Stepmake.make 
-
-dvi: $(DVI_FILES)
-
-ps: $(PS_FILES)
-
-# urg
-default:
-
-GENHTMLS = engraving colorado vocabulary computer-notation
-OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
-
-
-$(outdir)/glossary.dvi: $(outdir)/vocabulary.tex 
-$(outdir)/glossary.html: $(OUTGENHTMLS)
-
-local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
-       $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \
-         $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) \
-         | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
-
-$(outdir)/%.bib: %.bib
-       ln -f $< $@
-
-$(outdir)/%.html: %.bib
-       bib2html $< $@
-
-# Yeah right: 
-# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
-
-#out/%: $(outdir)/%
-#      cp -f $< $@
diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
new file mode 100644 (file)
index 0000000..db918ca
--- /dev/null
@@ -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/Makefile b/Documentation/topdocs/Makefile
deleted file mode 100644 (file)
index 53a8a26..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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 
-
-default: do-doc 
-
-
-# INFO_FILES = $(outdir)/$(package).info
-
-
-# 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
index 564d9ff9178032f7ace3858f55283a5399801a04..972df8af780b0b79bb07f835050b9a09bf4a4a81 100644 (file)
@@ -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)
index 28f5ea8ee39df6c616d04e801971468d93cc2fae..0e43156068ad4ba49e215d2d9d49eaae2b65ab1f 100644 (file)
@@ -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)
diff --git a/NEWS b/NEWS
index 495fa13d5b0916c3a1e4c74916d092fc1161b536..74472527887354d60df28d3dc66081f968aec6df 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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
index daeee8366232875f43a920b85711365cf0edb118..da3c54dfaaad87cb3fd381d3434da1375ed5bde4 100644 (file)
@@ -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.
diff --git a/TODO b/TODO
index 8a13a3860b1444008f7c0639a64624d318ccb504..2ea55b7d59acd5423de01bb24ebbb322c761cf13 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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
diff --git a/VERSION b/VERSION
index d0191175820dc0f1d4e202bed71e9b40c2b71c69..875f4fb000c286e6b48ade0c08c864b528d0aa51 100644 (file)
--- a/VERSION
+++ b/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 
index f7e18136b68f94f74298850d85bf220357fa2ada..660b3aca0afb084db32bbb80322a5431d81601fa 100644 (file)
@@ -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 (file)
index 0000000..3a24a75
--- /dev/null
@@ -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 (file)
index 11751d2..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# bin/Makefile
-
-depth = ..
-MAKEFILES=Script
-
-include $(depth)/make/Stepmake.make 
-
-
-
-
-
-
index 54964267a4f3c2682ebcc65812ccb7c9607d4948..e3925f717bff8ba73efa33905730f35710bc2048 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
 
 
index c77794dc885a8f6a8f79f348edae23af1e985244..ca80308b7d3d17d456317badd1fdf69cc2659e73 100644 (file)
@@ -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/GNUmakefile b/debian/GNUmakefile
new file mode 100644 (file)
index 0000000..6aac4c8
--- /dev/null
@@ -0,0 +1,18 @@
+# debian/Makefile
+
+depth = ..
+
+NAME= debian
+BLURBS=BLURB
+AT_FILES = $(BLURBS) # 
+at-dir = $(outdir)/
+at-ext =
+
+EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka
+CONF_FILES=changelog copyright postinst postrm rules watch 
+OUTCONF_FILES=$(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
+OUT_DIST_FILES = $(OUTIN_FILES)
+
+STEPMAKE_TEMPLATES = yolily-debian
+include $(depth)/make/stepmake.make 
+
diff --git a/debian/Makefile b/debian/Makefile
deleted file mode 100644 (file)
index a72baf0..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# debian/Makefile
-
-depth = ..
-
-NAME= debian
-BLURBS=BLURB
-AT_FILES = $(BLURBS) # 
-at-dir = $(outdir)/
-at-ext =
-
-EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka
-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 
-
-
-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/GNUmakefile b/flower/GNUmakefile
new file mode 100644 (file)
index 0000000..da46790
--- /dev/null
@@ -0,0 +1,23 @@
+# title           top level makefile for FlowerLib
+# file    flower/Makefile
+
+# should reinstate versioning if shared libs are enabled.
+
+depth = ..
+
+NAME = flower
+MODULE_NAME = flower
+SUBDIRS = include 
+
+SCRIPTS = 
+README_FILES = NEWS-1.0 NEWS-1.1.46 README TODO
+EXTRA_DIST_FILES= VERSION $(README_FILES) $(SCRIPTS)
+STEPMAKE_TEMPLATES=library c++
+
+
+
+include $(depth)/make/stepmake.make 
+
+foo:
+       echo $(DIST_FILES) $(O_FILES) $(OBJECT_FILES)
+
diff --git a/flower/Makefile b/flower/Makefile
deleted file mode 100644 (file)
index 3d71e4e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# title           top level makefile for FlowerLib
-# file    flower/Makefile
-
-# should reinstate versioning if shared libs are enabled.
-
-depth = ..
-
-NAME = flower
-MODULE_NAME = flower
-SUBDIRS = include 
-
-SCRIPTS = 
-README_FILES = NEWS-1.0 NEWS-1.1.46 README TODO
-EXTRA_DIST_FILES= VERSION $(README_FILES) $(SCRIPTS)
-MAKEFILES=Library C++
-
-
-
-include $(depth)/make/Stepmake.make 
-
diff --git a/flower/include/GNUmakefile b/flower/include/GNUmakefile
new file mode 100644 (file)
index 0000000..1d726fc
--- /dev/null
@@ -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 (file)
index 8e6af34..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# flower/lib/include/Makefile
-
-depth = ../..
-
-MAKEFILES=C++
-
-include $(depth)/make/Stepmake.make
-
-
diff --git a/init/GNUmakefile b/init/GNUmakefile
new file mode 100644 (file)
index 0000000..00000cc
--- /dev/null
@@ -0,0 +1,17 @@
+# init/Makefile
+
+depth = ..
+
+INI_FILES = $(FLY_FILES) $(LY_FILES)
+# DIST_FILES = Makefile $(INI_FILES)
+
+INSTALLATION_DIR=$(datadir)
+INSTALLATION_FILES=$(INI_FILES)
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make 
+
+
+include $(stepdir)/installfiles.make
+
diff --git a/init/Makefile b/init/Makefile
deleted file mode 100644 (file)
index 396cea2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# init/Makefile
-
-depth = ..
-
-INI_FILES = $(FLY_FILES) $(LY_FILES)
-# DIST_FILES = Makefile $(INI_FILES)
-
-INSTALLATION_DIR=$(datadir)
-INSTALLATION_FILES=$(INI_FILES)
-
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make 
-
-
-include $(stepdir)/Installfiles.make
-
index 75d8f106697595b561a776ae657372faea32f4fb..a53eccbf6ef3abaf5240eee9560975261adf116d 100644 (file)
@@ -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/GNUmakefile b/input/GNUmakefile
new file mode 100644 (file)
index 0000000..ad59365
--- /dev/null
@@ -0,0 +1,16 @@
+# input/Makefile
+
+depth = ..
+
+SUBDIRS=test bugs
+
+examples=example-3 twinkle-pop praeludium-fuga-E twinkle
+flexamples=example-1 example-2
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+
+include $(depth)/make/stepmake.make 
+
+local-check: $(addsuffix .dvi, $(addprefix $(outdir)/, $(examples)))
+
diff --git a/input/Makefile b/input/Makefile
deleted file mode 100644 (file)
index 90fade9..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# input/Makefile
-
-depth = ..
-
-SUBDIRS=test bugs
-
-examples=example-3 twinkle-pop praeludium-fuga-E twinkle
-flexamples=example-1 example-2
-
-LOCALMAKEFILES=Mutopia
-
-
-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 (file)
index 0000000..659a10c
--- /dev/null
@@ -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 (file)
index b6d2505..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# input/bugs/Makefile
-
-depth = ../..
-
-LOCALMAKEFILES=Mutopia
-include $(depth)/make/Stepmake.make 
-
-
diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
new file mode 100644 (file)
index 0000000..74fec0e
--- /dev/null
@@ -0,0 +1,8 @@
+# input/test/Makefile
+
+depth = ../..
+examples=font20 hara-kiri grace mark denneboom
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make 
+
diff --git a/input/test/Makefile b/input/test/Makefile
deleted file mode 100644 (file)
index 4e5503b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# input/test/Makefile
-
-depth = ../..
-examples=font20 hara-kiri grace mark denneboom
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make 
-
diff --git a/intl/GNUmakefile b/intl/GNUmakefile
new file mode 100644 (file)
index 0000000..0bce164
--- /dev/null
@@ -0,0 +1,50 @@
+# intl/Makefile
+
+depth = ..
+
+NAME = intl
+
+
+# MODULE_CXXFLAGS += -D_REENTRANT
+MAINTARGET = $(LIBRARY)# huh?
+
+SED_FILES = $(wildcard *.sed)
+
+# should be set by configure...
+URG_DEFINES = -DGNULOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(localedir):\"
+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'"
+
+lib:  $(LIBRARY)
+LIBINTL = $(LIBRARY)
+
+install-lib: $(LIBINTL)
+# localinstall: $(LIBINTL)
+       $(INSTALL) -d $(includedir)
+#      $(INSTALL) libintl.h $(includedir)
+       $(INSTALL) libintl.inst $(includedir)/libintl.h
+ifeq ($(LIB_SUFFIX),.so)
+       $(INSTALL) -d $(libdir)
+       $(INSTALL) $(LIBINTL).$(VERSION) $(libdir)
+       ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
+       ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
+else
+       $(INSTALL) -d $(libdir)
+       echo libintl: $(LIBINTL)
+       echo libdir: $(libdir)
+       $(INSTALL) $(LIBINTL) $(libdir)
+endif
+
+localuninstall:
+       rm -f $(inludedir)/libintl.h
+       rm -f $(libdir)/libintl.{so*,a}
+
diff --git a/intl/Makefile b/intl/Makefile
deleted file mode 100644 (file)
index 7679393..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# intl/Makefile
-
-depth = ..
-
-NAME = intl
-
-include $(depth)/make/Stepmake.make
-include $(stepdir)/C.make
-
-
-# MODULE_CXXFLAGS += -D_REENTRANT
-MAINTARGET = $(LIBRARY)# huh?
-
-SED_FILES = $(wildcard *.sed)
-
-# should be set by configure...
-URG_DEFINES = -DGNULOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(localedir):\"
-EXTRA_CFLAGS = -I. $(URG_DEFINES)
-
-EXTRA_DIST_FILES = Makefile.in.dist cat-compat.c.dist ChangeLog libintl.inst $(SED_FILES)
-
-default:
-       @echo "to install libintl type 'make lib; make install-lib'"
-
-lib:  $(LIBRARY)
-LIBINTL = $(LIBRARY)
-
-install-lib: $(LIBINTL)
-# localinstall: $(LIBINTL)
-       $(INSTALL) -d $(includedir)
-#      $(INSTALL) libintl.h $(includedir)
-       $(INSTALL) libintl.inst $(includedir)/libintl.h
-ifeq ($(LIB_SUFFIX),.so)
-       $(INSTALL) -d $(libdir)
-       $(INSTALL) $(LIBINTL).$(VERSION) $(libdir)
-       ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
-       ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
-else
-       $(INSTALL) -d $(libdir)
-       echo libintl: $(LIBINTL)
-       echo libdir: $(libdir)
-       $(INSTALL) $(LIBINTL) $(libdir)
-endif
-
-localuninstall:
-       rm -f $(inludedir)/libintl.h
-       rm -f $(libdir)/libintl.{so*,a}
-
index 2a0573551617e9573fa8a2eedfb6303529cccda6..3d3f59cb019011ed4520d001799bea2a684e3138 100644 (file)
@@ -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/GNUmakefile b/lib/GNUmakefile
new file mode 100644 (file)
index 0000000..7000844
--- /dev/null
@@ -0,0 +1,13 @@
+# lib/Makefile
+
+depth = ..
+
+NAME = lily
+SUBDIRS = include
+# MODULE_LIBS= $(depth)/flower
+MODULE_CXXFLAGS += -D_REENTRANT
+STEPMAKE_TEMPLATES=library c++
+
+include $(depth)/make/stepmake.make 
+
+
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644 (file)
index 93e2b14..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# lib/Makefile
-
-depth = ..
-
-NAME = lily
-SUBDIRS = include
-# MODULE_LIBS= $(depth)/flower
-MODULE_CXXFLAGS += -D_REENTRANT
-MAKEFILES=Library C++
-
-include $(depth)/make/Stepmake.make 
-
-
diff --git a/lib/include/GNUmakefile b/lib/include/GNUmakefile
new file mode 100644 (file)
index 0000000..7dccdbc
--- /dev/null
@@ -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 (file)
index cfe2170..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# lib/include/Makefile
-
-depth = ../..
-MAKEFILES=C++
-
-include $(depth)/make/Stepmake.make
-
-
-
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
new file mode 100644 (file)
index 0000000..47338e5
--- /dev/null
@@ -0,0 +1,30 @@
+# title           makefile for lilypond
+# file    lily/Makefile 
+
+depth = ..
+
+NAME = lilypond
+SUBDIRS = include
+
+EXTRA_DIST_FILES = VERSION 
+MODULE_LIBS=$(depth)/lib $(depth)/flower
+
+STEPMAKE_TEMPLATES= c++ executable 
+
+include $(depth)/make/stepmake.make 
+
+# force these: Make can't know these have to be generated in advance
+$(outdir)/my-lily-parser.o: $(outdir)/parser.hh
+$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
+$(outdir)/lexer.o: $(outdir)/parser.hh
+
+
+$(outdir)/lily-version.o: $(outdir)/version.hh
+
+$(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh
+
+
+# ugh . -> $(outdir)
+VERSION: $(depth)/VERSION
+       cp $< $@
+
diff --git a/lily/Makefile b/lily/Makefile
deleted file mode 100644 (file)
index d5464bf..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# title           makefile for lilypond
-# file    lily/Makefile 
-
-depth = ..
-
-NAME = lilypond
-SUBDIRS = include
-
-EXTRA_DIST_FILES = VERSION 
-MODULE_LIBS=$(depth)/lib $(depth)/flower
-
-MAKEFILES=C++ Executable 
-
-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)/lexer.o: $(outdir)/parser.hh
-
-
-$(outdir)/lily-version.o: $(outdir)/version.hh
-
-$(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh
-
-
-# ugh . -> $(outdir)
-VERSION: $(depth)/VERSION
-       cp $< $@
-
index d0191175820dc0f1d4e202bed71e9b40c2b71c69..875f4fb000c286e6b48ade0c08c864b528d0aa51 100644 (file)
@@ -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 (file)
index 0000000..ae2bfb6
--- /dev/null
@@ -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 (file)
index a9ebc88..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# lily/include/Makefile
-
-depth = ../..
-MAKEFILES=C++
-
-include $(depth)/make/Stepmake.make
-
-
index 296350de453461239a03edb7566b557178c47216..e4b42d12330a7065aaf733e445d35bbb18b52853 100644 (file)
@@ -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
index 8ed3989043f69944ed4c1cad1f4e7d59bf2c2bc4..ceba7c467e16cbc683b119e006a322e5072c83ab 100644 (file)
@@ -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);
 
index 4b9ec9fd2f86a2891a145c40231b29ca0d6ff51c..5df3722a0a5997cdab847897f6fe7670ba5bb84a 100644 (file)
@@ -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;
index 435e312729ed365241da483aa725374fca0c64c1..671ca17e38f425cfb13c26ecb41aea0f3bca7efa 100644 (file)
@@ -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);
     }
index b0dbaf5611c667eea0e2d1163dfa3908603f71a2..6c1664017b558d6fefcf0ccc7db90981bde7829d 100644 (file)
@@ -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 (file)
index 4b1c261..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Docrules.make
-
-include $(make-dir)/Mudela_rules.make
diff --git a/make/GNUmakefile b/make/GNUmakefile
new file mode 100644 (file)
index 0000000..441e932
--- /dev/null
@@ -0,0 +1,10 @@
+# file    make/Makefile 
+
+depth = ..
+STEPMAKE_TEMPLATES=makedir
+BLURBS=BLURB # COPERTINA FLAPTEKST
+
+include $(depth)/make/stepmake.make 
+
+
+
diff --git a/make/Lilypond_rules.make b/make/Lilypond_rules.make
deleted file mode 100644 (file)
index ea30561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#empty
diff --git a/make/Lilypond_targets.make b/make/Lilypond_targets.make
deleted file mode 100644 (file)
index ea30561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#empty
diff --git a/make/Lilypond_vars.make b/make/Lilypond_vars.make
deleted file mode 100644 (file)
index 1452731..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
-export MFINPUTS:=$(topdir)/mf/:.:$(MFINPUTS)::
-export TEXINPUTS:=$(topdir)/tex/:.:$(TEXINPUTS)::
-export LILYINCLUDE=$(topdir)/init:$(topdir)/mf/out
-
diff --git a/make/Makefile b/make/Makefile
deleted file mode 100644 (file)
index dec2c68..0000000
+++ /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/Mudela_rules.make b/make/Mudela_rules.make
deleted file mode 100644 (file)
index 5a7d8ef..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Mudela_rules.make
-
-.SUFFIXES: .doc .dvi .mudtex
-
-$(outdir)/%.dvi: $(outdir)/%.mudtex
-       latex '\nonstopmode \input $<'
-       mv $(notdir $@) $(outdir)
-
-$(outdir)/%.mudtex: %.doc
-       $(PYTHON) $(depth)/scripts/mudela-book.py --outdir=$(outdir)/ --outname=$(notdir $@) $<
-
diff --git a/make/Mutopia.make b/make/Mutopia.make
deleted file mode 100644 (file)
index 1c541ee..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# make/Mutopia.make
-
-
diff --git a/make/Mutopia_rules.make b/make/Mutopia_rules.make
deleted file mode 100644 (file)
index 0b16e7e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$(outdir)/%.gif: $(outdir)/%.ps
-       sh $(buildscripts)/ps-to-gifs.sh $<
-       -mv $(name-stem)-page*.gif $(outdir)/
-       touch $@
-
-$(outdir)/%.ly.txt: %.ly
-       ln -f $< $@
-
-$(outdir)/%.fly.txt: %.fly
-       ln -f $< $@
-
-
-
-# don't junk intermediate .dvi files.  They're easier to view than
-# .ps or .gif
-.PRECIOUS: $(outdir)/%.dvi
-
-$(outdir)/%.dvi: %.ly
-       sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
-       -mv $(basename $<).midi $(outdir)
-
-$(outdir)/%.dvi: %.fly
-       sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
-       -mv $(basename $<).midi $(outdir)
diff --git a/make/Mutopia_targets.make b/make/Mutopia_targets.make
deleted file mode 100644 (file)
index 4aa51ff..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-all: $(OUT_FILES)
-
-
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples)
-       (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html
-       echo $^ > $(depth)/wwwlist
diff --git a/make/Mutopia_vars.make b/make/Mutopia_vars.make
deleted file mode 100644 (file)
index b05154a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# UGH UGH
-include $(make-dir)/Lilypond_vars.make
-
-FLY_FILES = $(wildcard *.fly)
-LY_FILES = $(wildcard *.ly)
-M4_FILES = $(wildcard *.m4)
-LYM4_FILES = $(wildcard *.lym4)
-EXTRA_DIST_FILES += $(FLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES)
-
-# WWW.make
-
-ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
-fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples)))
-
-all_examples=$(flexamples) $(examples)
-
-ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
-gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
-
-html_subdirs=$(addprefix --subdirs ,$(SUBDIRS))
-
-
-name-stem= $(notdir $(basename $<))
-
-OUT_FILES = $(addprefix $(outdir)/,$(M4_FILES:%.m4=%)) \
- $(addprefix $(outdir)/,$(LYM4_FILES:%.lym4=%.ly))
diff --git a/make/Rules.make b/make/Rules.make
deleted file mode 100644 (file)
index 8ea9451..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# title           package specific rules
-# file    make/Rules.make
-
-# urg
-$(outdir)/%.ly: %.lym4
-       $(M4) $< | sed "s/\`/,/g" > $@
-
-$(outdir)/%: %.in
-       rm -f $@
-       cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
-
-
-
-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 >> $@
-
-# HUH???
-$(outdir)/%.hh: $(doc-dir)/%.in
-       rm -f $@
-       echo '_(' > $@
-       cat $< | $(sed-quotes) | $(sed-newline) | $(sed-quote-line) >> $@
-       echo ');' >> $@
-
diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
deleted file mode 100644 (file)
index 6e2775a..0000000
+++ /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 (file)
index c8c827e..0000000
+++ /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/Substitute.make b/make/Substitute.make
deleted file mode 100644 (file)
index 16389f9..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# make/Substitute.make
-
-sed-examples = sed 's!@EXAMPLE_LYS@!${rpmexamples} ${rpmmudocs}!g'
-sed-docs=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
-
-ATVARIABLES = \
-  BASH\
-  DATE\
-  date\
-  DIR_DATADIR\
-  PACKAGE\
-  package\
-  PERL\
-  PYTHON\
-  SHELL\
-  TOPLEVEL_VERSION\
-  step-bindir\
-  abs-step-bindir\
-
-
diff --git a/make/Targets.make b/make/Targets.make
deleted file mode 100644 (file)
index f2b55fb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# title           package specific targets
-# file    make/Targets.make
-
-
-# urg!
-$(configheader): $(depth)/$(configuration).hh
-       cp $< $@
-
diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
deleted file mode 100644 (file)
index b09aa86..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*-Makefile-*-
-# title           specific top level makefile for LilyPond  
-
-# subdir level:
-#
-depth = .
-#
-
-# descent order into subdirectories:
-#
-SUBDIRS = scripts buildscripts  flower lib lily mf mi2mu po debian \
-       Documentation init input tex make mutopia test intl stepmake
-#
-
-SCRIPTS = configure aclocal.m4
-README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCEMENT \
- COPYING NEWS-0.1 NEWS-0.0 NEWS  TODO
-README_TXT_FILES = README.txt AUTHORS.txt INSTALL.txt PATCHES.txt
-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:
-#
-include $(stepdir)/Toplevel.make
-
-aclocal.m4: $(stepdir)/../aclocal.m4
-       cp $< $@
-
-website: examples htmldoc doc++
-
-examples:
-       $(MAKE) CONFIGSUFFIX='www' -C input WWW
-       $(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/make/Toplevel_version.make b/make/Toplevel_version.make
deleted file mode 100644 (file)
index 4a1e24e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Toplevel_version.make
-
-include $(depth)/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:
-TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL)
diff --git a/make/User.make b/make/User.make
deleted file mode 100644 (file)
index 598bc73..0000000
+++ /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/make/Variables.make b/make/Variables.make
deleted file mode 100644 (file)
index a547619..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-# title           package specific variables
-# file    make/Variables.make
-#
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
-#
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
-#
-
-buildscripts = $(depth)/buildscripts
-
-
-flower-dir = $(depth)/flower
-lib-dir = $(depth)/lib
-lily-dir = $(depth)/lily
-mi2mu-dir = $(depth)/mi2mu
-make-dir = $(depth)/make
-include-lib = $(depth)/lib/include
-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 ?
-
-# installed by 'make installextradoc'
-EXTRA_DOC_FILES = \
-  ANNOUNCEMENT ANNOUNCE-0.1 AUTHORS.txt BUGS COPYING DEDICATION INSTALL.txt NEWS PATCHES.txt README.txt TODO \
-  Documentation/out/*.txt\
-  Documentation/tex/*.doc\
-  Documentation/tex/*.bib\
-  Documentation/pictures/out/lelie_logo.gif\
-  input\
-  mutopia\
-
-INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES))
-
-# installed by 'make install'
-INSTALL_DIST_FILES = \
-  bin/convert-mudela\
-  bin/mudela-book\
-  bin/ly2dvi\
-  bin/lilypond$(DOTEXE)\
-  bin/mi2mu$(DOTEXE)\
-  info/lilypond.info\
-  man/man1/mi2mu.1\
-  man/man1/lilypond.1\
-  man/man1/mudela-book.1\
-  man/man1/ly2dvi.1\
-  man/man1/convert-mudela.1\
-  lib/texmf/texmf/tex/lilypond\
-  lib/texmf/texmf/fonts/source/public/lilypond\
-  share/lilypond/\
-  share/locale/*/LC_MESSAGES/lilypond.mo\
-
-
-INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))
-
diff --git a/make/docrules.make b/make/docrules.make
new file mode 100644 (file)
index 0000000..9351453
--- /dev/null
@@ -0,0 +1,3 @@
+# Docrules.make
+
+include $(make-dir)/mudela_rules.make
diff --git a/make/generic-rules.make b/make/generic-rules.make
new file mode 100644 (file)
index 0000000..1d885c7
--- /dev/null
@@ -0,0 +1,23 @@
+# title           package specific rules
+# file    make/Rules.make
+
+# urg
+$(outdir)/%.ly: %.lym4
+       $(M4) $< | sed "s/\`/,/g" > $@
+
+$(outdir)/%: %.in
+       rm -f $@
+       cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
+
+
+
+include $(depth)/make/substitute.make
+
+
+# HUH???
+$(outdir)/%.hh: $(doc-dir)/%.in
+       rm -f $@
+       echo '_(' > $@
+       cat $< | $(sed-quotes) | $(sed-newline) | $(sed-quote-line) >> $@
+       echo ');' >> $@
+
diff --git a/make/generic-targets.make b/make/generic-targets.make
new file mode 100644 (file)
index 0000000..7f4a380
--- /dev/null
@@ -0,0 +1,2 @@
+# title           package specific targets
+# file    make/Targets.make
diff --git a/make/generic-vars.make b/make/generic-vars.make
new file mode 100644 (file)
index 0000000..8c90d01
--- /dev/null
@@ -0,0 +1,61 @@
+# title           package specific variables
+# file    make/Variables.make
+#
+# do not change this file for site-wide extensions; please use 
+# make/$(outdir)/Site.make; 
+#
+# Any change in files in this directory (make/) would be distributed, if 
+# you do make dist 
+#
+
+buildscripts = $(depth)/buildscripts
+
+
+flower-dir = $(depth)/flower
+lib-dir = $(depth)/lib
+lily-dir = $(depth)/lily
+mi2mu-dir = $(depth)/mi2mu
+make-dir = $(depth)/make
+include-lib = $(depth)/lib/include
+include-flower = $(depth)/flower/include
+
+
+
+LILYPOND_INCLUDES = $(include-lib) $(depth)/lib/$(outdir) $(include-flower) $(depth)/flower/$(outdir) 
+
+
+# should use to create .spec ?
+
+# installed by 'make installextradoc'
+EXTRA_DOC_FILES = \
+  ANNOUNCEMENT ANNOUNCE-0.1 AUTHORS.txt BUGS COPYING DEDICATION INSTALL.txt NEWS PATCHES.txt README.txt TODO \
+  Documentation/out/*.txt\
+  Documentation/tex/*.doc\
+  Documentation/tex/*.bib\
+  Documentation/pictures/out/lelie_logo.gif\
+  input\
+  mutopia\
+
+INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES))
+
+# installed by 'make install'
+INSTALL_DIST_FILES = \
+  bin/convert-mudela\
+  bin/mudela-book\
+  bin/ly2dvi\
+  bin/lilypond$(DOTEXE)\
+  bin/mi2mu$(DOTEXE)\
+  info/lilypond.info\
+  man/man1/mi2mu.1\
+  man/man1/lilypond.1\
+  man/man1/mudela-book.1\
+  man/man1/ly2dvi.1\
+  man/man1/convert-mudela.1\
+  lib/texmf/texmf/tex/lilypond\
+  lib/texmf/texmf/fonts/source/public/lilypond\
+  share/lilypond/\
+  share/locale/*/LC_MESSAGES/lilypond.mo\
+
+
+INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))
+
diff --git a/make/lilypond-rules.make b/make/lilypond-rules.make
new file mode 100644 (file)
index 0000000..ea30561
--- /dev/null
@@ -0,0 +1 @@
+#empty
diff --git a/make/lilypond-targets.make b/make/lilypond-targets.make
new file mode 100644 (file)
index 0000000..ea30561
--- /dev/null
@@ -0,0 +1 @@
+#empty
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
new file mode 100644 (file)
index 0000000..1452731
--- /dev/null
@@ -0,0 +1,6 @@
+
+export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
+export MFINPUTS:=$(topdir)/mf/:.:$(MFINPUTS)::
+export TEXINPUTS:=$(topdir)/tex/:.:$(TEXINPUTS)::
+export LILYINCLUDE=$(topdir)/init:$(topdir)/mf/out
+
diff --git a/make/mudela-rules.make b/make/mudela-rules.make
new file mode 100644 (file)
index 0000000..5a7d8ef
--- /dev/null
@@ -0,0 +1,11 @@
+# Mudela_rules.make
+
+.SUFFIXES: .doc .dvi .mudtex
+
+$(outdir)/%.dvi: $(outdir)/%.mudtex
+       latex '\nonstopmode \input $<'
+       mv $(notdir $@) $(outdir)
+
+$(outdir)/%.mudtex: %.doc
+       $(PYTHON) $(depth)/scripts/mudela-book.py --outdir=$(outdir)/ --outname=$(notdir $@) $<
+
diff --git a/make/mudela-targets.make b/make/mudela-targets.make
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/make/mudela-vars.make b/make/mudela-vars.make
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
new file mode 100644 (file)
index 0000000..0b16e7e
--- /dev/null
@@ -0,0 +1,26 @@
+
+
+$(outdir)/%.gif: $(outdir)/%.ps
+       sh $(buildscripts)/ps-to-gifs.sh $<
+       -mv $(name-stem)-page*.gif $(outdir)/
+       touch $@
+
+$(outdir)/%.ly.txt: %.ly
+       ln -f $< $@
+
+$(outdir)/%.fly.txt: %.fly
+       ln -f $< $@
+
+
+
+# don't junk intermediate .dvi files.  They're easier to view than
+# .ps or .gif
+.PRECIOUS: $(outdir)/%.dvi
+
+$(outdir)/%.dvi: %.ly
+       sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+       -mv $(basename $<).midi $(outdir)
+
+$(outdir)/%.dvi: %.fly
+       sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+       -mv $(basename $<).midi $(outdir)
diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
new file mode 100644 (file)
index 0000000..4aa51ff
--- /dev/null
@@ -0,0 +1,9 @@
+
+
+all: $(OUT_FILES)
+
+
+local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples)
+       (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html
+       echo $^ > $(depth)/wwwlist
diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
new file mode 100644 (file)
index 0000000..92ef7c0
--- /dev/null
@@ -0,0 +1,27 @@
+
+# UGH UGH
+include $(make-dir)/lilypond-vars.make
+
+FLY_FILES = $(wildcard *.fly)
+LY_FILES = $(wildcard *.ly)
+M4_FILES = $(wildcard *.m4)
+LYM4_FILES = $(wildcard *.lym4)
+EXTRA_DIST_FILES += $(FLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES)
+
+# WWW.make
+
+ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
+fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples)))
+
+all_examples=$(flexamples) $(examples)
+
+ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
+gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
+
+html_subdirs=$(addprefix --subdirs ,$(SUBDIRS))
+
+
+name-stem= $(notdir $(basename $<))
+
+OUT_FILES = $(addprefix $(outdir)/,$(M4_FILES:%.m4=%)) \
+ $(addprefix $(outdir)/,$(LYM4_FILES:%.lym4=%.ly))
diff --git a/make/mutopia.make b/make/mutopia.make
new file mode 100644 (file)
index 0000000..1c541ee
--- /dev/null
@@ -0,0 +1,3 @@
+# make/Mutopia.make
+
+
index 4303590da8b2ddb74f1ac739126cb6c58eaa6491..e8e8b5a297fa2e9da42f7bf3e0eef6152b7ca617 100644 (file)
@@ -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
index d85b09323d1d8aec97bdb05e57e07537c8678ff5..962f34360f3d41977b2ec1be3e5ef38d1bbeca6e 100644 (file)
@@ -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
index 37498a249052f4570065204d55a1e63cea3324ff..e04958140d6e147aa47c2ef30b0720db6944bdd9 100644 (file)
@@ -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 (file)
index 0000000..e08af84
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..6e80db5
--- /dev/null
@@ -0,0 +1,20 @@
+# make/Substitute.make
+
+#guh
+include $(stepdir)/substitute-vars.make
+
+ATVARIABLES = \
+  BASH\
+  DATE\
+  date\
+  DIR_DATADIR\
+  PACKAGE\
+  package\
+  PERL\
+  PYTHON\
+  SHELL\
+  TOPLEVEL_VERSION\
+  step-bindir\
+  abs-step-bindir\
+
+
diff --git a/make/toplevel-version.make b/make/toplevel-version.make
new file mode 100644 (file)
index 0000000..4a1e24e
--- /dev/null
@@ -0,0 +1,8 @@
+# Toplevel_version.make
+
+include $(depth)/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:
+TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL)
diff --git a/make/toplevel.make.in b/make/toplevel.make.in
new file mode 100644 (file)
index 0000000..99f7a0a
--- /dev/null
@@ -0,0 +1,35 @@
+# -*-Makefile-*-
+# title           specific top level makefile for LilyPond  
+
+# subdir level:
+#
+depth = .
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = scripts buildscripts  flower lib lily mf mi2mu po debian \
+       Documentation init input tex make mutopia test intl stepmake
+#
+
+SCRIPTS = configure aclocal.m4
+README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCEMENT \
+ COPYING NEWS-0.1 NEWS-0.0 NEWS  TODO
+README_TXT_FILES = README.txt AUTHORS.txt INSTALL.txt PATCHES.txt
+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:
+#
+STEPMAKE_TEMPLATES=toplevel yolily-toplevel
+include $(depth)/make/stepmake.make 
+#
+
+website: examples htmldoc doc++
+
+examples:
+       $(MAKE) CONFIGSUFFIX='www' -C input WWW
+       $(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`
+
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
new file mode 100644 (file)
index 0000000..07d99c1
--- /dev/null
@@ -0,0 +1,49 @@
+# mf/Makefile
+
+depth = ..
+
+STEPMAKE_TEMPLATES=metafont
+
+EXTRA_DIST_FILES += TODO README
+
+FET_FILES = $(wildcard feta[0-9]*.mf)
+
+LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
+LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
+TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
+
+ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
+
+OUT_DIST_FILES += $(AFM_FILES)
+
+include $(depth)/make/stepmake.make 
+
+default: $(ALL_GEN_FILES)
+
+
+$(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 $@
+
+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 $@
+
+localinstall: $(ALL_GEN_FILES)
+       $(TEXINSTALL)
+       $(LYINSTALL)
+       $(AFMINSTALL)
+
+localuninstall:
+       $(TEXINSTALL)
+       $(LYINSTALL)
+       $(AFMINSTALL)
+
+INSTALLATION_DIR=$(MFDIR)/public/lilypond
+INSTALLATION_FILES=$(MF_FILES)
+
+include $(stepdir)/installfiles.make
+
diff --git a/mf/Makefile b/mf/Makefile
deleted file mode 100644 (file)
index 11418e3..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# mf/Makefile
-
-depth = ..
-
-MAKEFILES=Metafont
-
-EXTRA_DIST_FILES += TODO README
-
-FET_FILES = $(wildcard feta[0-9]*.mf)
-
-LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
-LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
-TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
-
-ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
-
-OUT_DIST_FILES += $(AFM_FILES)
-
-include $(depth)/make/Stepmake.make 
-
-default: $(ALL_GEN_FILES)
-
-
-$(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 $@
-
-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 $@
-
-localinstall: $(ALL_GEN_FILES)
-       $(TEXINSTALL)
-       $(LYINSTALL)
-       $(AFMINSTALL)
-
-localuninstall:
-       $(TEXINSTALL)
-       $(LYINSTALL)
-       $(AFMINSTALL)
-
-INSTALLATION_DIR=$(MFDIR)/public/lilypond
-INSTALLATION_FILES=$(MF_FILES)
-
-include $(stepdir)/Installfiles.make
-
index 1ae189f1faf6eae6214e276040d28dd7e26db91a..fe1200789c53dee9d2e71fd91e0fccf61beeea0d 100644 (file)
@@ -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/GNUmakefile b/mi2mu/GNUmakefile
new file mode 100644 (file)
index 0000000..067b0c5
--- /dev/null
@@ -0,0 +1,25 @@
+# title           makefile for mi2mu
+# file    mi2mu/Makefile 
+
+depth = ..
+
+NAME = mi2mu
+MODULE_NAME = mi2mu
+
+SUBDIRS = include
+EXTRA_DIST_FILES += TODO
+MODULE_LIBS=$(depth)/lib $(depth)/flower
+
+STEPMAKE_TEMPLATES=c++ executable
+
+include $(depth)/make/stepmake.make 
+
+# explicit dependencies: (how to do auto?)
+#
+midi-lexer.l:  $(outdir)/midi-parser.hh
+
+
+$(outdir)/mi2mu-version.o: $(outdir)/version.hh
+
+VERSION: $(depth)/VERSION
+       cp $< $@
diff --git a/mi2mu/Makefile b/mi2mu/Makefile
deleted file mode 100644 (file)
index 6b6d955..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# title           makefile for mi2mu
-# file    mi2mu/Makefile 
-
-depth = ..
-
-NAME = mi2mu
-MODULE_NAME = mi2mu
-
-SUBDIRS = include
-EXTRA_DIST_FILES += TODO
-MODULE_LIBS=$(depth)/lib $(depth)/flower
-
-MAKEFILES=C++ Executable
-
-include $(depth)/make/Stepmake.make 
-
-# explicit dependencies: (how to do auto?)
-#
-midi-lexer.l:  $(outdir)/midi-parser.hh
-
-
-$(outdir)/mi2mu-version.o: $(outdir)/version.hh
-
-VERSION: $(depth)/VERSION
-       cp $< $@
diff --git a/mi2mu/include/GNUmakefile b/mi2mu/include/GNUmakefile
new file mode 100644 (file)
index 0000000..1a19230
--- /dev/null
@@ -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 (file)
index 3f9a0ac..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# lib/include/Makefile
-
-depth = ../..
-MAKEFILES=C++
-include $(depth)/make/Stepmake.make
-
diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile
new file mode 100644 (file)
index 0000000..90bb711
--- /dev/null
@@ -0,0 +1,12 @@
+# mutopia/Makefile
+
+depth = ../..
+
+# do Coriolan if you have plenty RAM / CPU
+examples=coriolan oboi-part viola-part
+# examples= oboi-part viola-part
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make
+
diff --git a/mutopia/Coriolan/Makefile b/mutopia/Coriolan/Makefile
deleted file mode 100644 (file)
index 6fcbed0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# mutopia/Makefile
-
-depth = ../..
-
-# do Coriolan if you have plenty RAM / CPU
-examples=coriolan oboi-part viola-part
-# examples= oboi-part viola-part
-
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make
-
diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile
new file mode 100644 (file)
index 0000000..5ae8694
--- /dev/null
@@ -0,0 +1,15 @@
+# mutopia/Makefile
+
+depth = ..
+
+SUBDIRS = J.S.Bach Coriolan W.A.Mozart
+
+examples=standchen gallina
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make
+
+EXTRA_DIST_FILES +=  TODO
+
+
+
diff --git a/mutopia/J.S.Bach/GNUmakefile b/mutopia/J.S.Bach/GNUmakefile
new file mode 100644 (file)
index 0000000..c5f8a88
--- /dev/null
@@ -0,0 +1,13 @@
+# mutopia/J.S.Bach/Makefile
+
+depth = ../..
+
+SUBDIRS = Petites-Preludes Solo-Cello-Suites 
+EXTRA_DIST_FILES=
+
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+examples=wtk1-fugue2
+
+include $(depth)/make/stepmake.make
+
diff --git a/mutopia/J.S.Bach/Makefile b/mutopia/J.S.Bach/Makefile
deleted file mode 100644 (file)
index 1c0dfad..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# mutopia/J.S.Bach/Makefile
-
-depth = ../..
-
-SUBDIRS = Petites-Preludes Solo-Cello-Suites 
-EXTRA_DIST_FILES=
-
-
-LOCALMAKEFILES=Mutopia
-examples=wtk1-fugue2
-
-include $(depth)/make/Stepmake.make
-
diff --git a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile
new file mode 100644 (file)
index 0000000..e1d72d7
--- /dev/null
@@ -0,0 +1,10 @@
+# mutopia/J.S.Bach/Petites-Preludes/Makefile
+
+depth = ../../..
+
+EXTRA_DIST_FILES=
+
+examples=preludes-2
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make
diff --git a/mutopia/J.S.Bach/Petites-Preludes/Makefile b/mutopia/J.S.Bach/Petites-Preludes/Makefile
deleted file mode 100644 (file)
index 0abaee2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# mutopia/J.S.Bach/Petites-Preludes/Makefile
-
-depth = ../../..
-
-EXTRA_DIST_FILES=
-
-examples=preludes-2
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile b/mutopia/J.S.Bach/Solo-Cello-Suites/GNUmakefile
new file mode 100644 (file)
index 0000000..18e9385
--- /dev/null
@@ -0,0 +1,10 @@
+# mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
+
+depth = ../../..
+
+EXTRA_DIST_FILES=
+
+examples=scsii-cello
+LOCALSTEPMAKE_TEMPLATES=mutopia
+
+include $(depth)/make/stepmake.make
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile b/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
deleted file mode 100644 (file)
index 95b05a7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
-
-depth = ../../..
-
-EXTRA_DIST_FILES=
-
-examples=scsii-cello
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly
new file mode 100644 (file)
index 0000000..e8fbc3b
--- /dev/null
@@ -0,0 +1,49 @@
+\header{
+filename =      "allemande-alto.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Allemande";
+% opus =        "BWV 1008";
+opus =  "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "allemande-urtext.ly";
+
+allemande_alto_global = \melodic{
+       \time 4/4;
+       \key f;
+       \partial 16;
+       \clef alto;
+       \skip 1*11;
+       s2. s8.
+       \bar ":|:";
+       \skip 1*11;
+       s2. s4 s8
+       \bar ":|";
+}
+
+allemande_alto_scripts = \melodic{
+}
+
+allemande_alto_staff = \type Staff <
+       \melodic \transpose c'' \$allemande
+       \$allemande_alto_global
+       \$allemande_alto_scripts
+>
+
+\score{
+       \$allemande_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 45; }
+}
+
index c1f7e46dcae5187405a439e030bb1b93cae80cb9..114480452cdf6804ef0923095259d92d3e2a22e1 100644 (file)
@@ -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"; }
 }
 
index 5d80bab7143fba5c386ebfce340e2139f38b31ff..0b9c0fb9bb9d98a5df616c379334ef909337255f 100644 (file)
@@ -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/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
deleted file mode 100644 (file)
index cd01a3a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-\header{
-filename =      "allemande-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Allemande";
-% opus =        "BWV 1008";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "allemande-urtext.ly";
-
-allemande_viola_global = \melodic{
-       \time 4/4;
-       \key f;
-       \partial 16;
-       \clef alto;
-       \skip 1*11;
-       s2. s8.
-       \bar ":|:";
-       \skip 1*11;
-       s2. s4 s8
-       \bar ":|";
-}
-
-allemande_viola_scripts = \melodic{
-}
-
-allemande_viola_staff = \type Staff <
-       \melodic \transpose c'' \$allemande
-       \$allemande_viola_global
-       \$allemande_viola_scripts
->
-
-\score{
-       \$allemande_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 45; }
-       \header{ piece = "Allemande"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly
new file mode 100644 (file)
index 0000000..8e7f097
--- /dev/null
@@ -0,0 +1,49 @@
+\header{
+filename =      "courante-alto.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Courante";
+% opus =        "BWV 1008";
+opus =  "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "courante-urtext.ly";
+
+courante_alto_global = \melodic{
+       \time 3/4;
+       \key f;
+       \partial 16;
+       \clef alto;
+       \skip 2.*15;
+       s2 s8.
+       \bar ":|:";
+       \skip 2.*15;
+       s2 s8.
+       \bar ":|";
+}
+
+courante_alto_scripts = \melodic{
+}
+
+courante_alto_staff = \type Staff <
+       \melodic \transpose c' \$courante
+       \$courante_alto_global
+       \$courante_alto_scripts
+>
+
+\score{
+       \$courante_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 55; }
+}
+
index da6812acd725b6930d6aa384fc68deca49787e70..5909c0be7dab52533c6c954eb1a046206edc454d 100644 (file)
@@ -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"; }
 }
 
index 3d540b4378c9d821288a5bc06a876a97bb7386e7..c04de2dac631e85881dc640be3fcf94354acc0e2 100644 (file)
@@ -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/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
deleted file mode 100644 (file)
index a6097d0..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-\header{
-filename =      "courante-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Courante";
-% opus =        "BWV 1008";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "courante-urtext.ly";
-
-courante_viola_global = \melodic{
-       \time 3/4;
-       \key f;
-       \partial 16;
-       \clef alto;
-       \skip 2.*15;
-       s2 s8.
-       \bar ":|:";
-       \skip 2.*15;
-       s2 s8.
-       \bar ":|";
-}
-
-courante_viola_scripts = \melodic{
-}
-
-courante_viola_staff = \type Staff <
-       \melodic \transpose c' \$courante
-       \$courante_viola_global
-       \$courante_viola_scripts
->
-
-\score{
-       \$courante_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 55; }
-       \header{ piece = "Courante"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly
new file mode 100644 (file)
index 0000000..784dea6
--- /dev/null
@@ -0,0 +1,50 @@
+\header{
+filename =      "gigue-cello.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";          % duh
+% opus =        "BWV 1008";
+opus =  "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "gigue-urtext.ly";
+
+gigue_cello_global = \melodic{
+       \time 3/8;
+       \key f;
+       \clef bass;
+       \partial 8
+       \skip 4.*31;
+       s4
+       \bar ":|:";
+       \skip 4.*44;
+       s4
+       \bar ":|";
+}
+
+gigue_cello_scripts = \melodic{
+}
+
+gigue_cello_staff = \type Staff <
+       \melodic \transpose c' \$gigue
+       \$gigue_cello_global
+       \$gigue_cello_scripts
+>
+
+\score{
+       \$gigue_cello_staff
+       \include "scs-paper.ly";
+%broken
+       \midi{ \tempo 4 = 60; }
+}
+
index 8d08d1de8a9f1bfc0e3dc8a00deec33e40d7bf13..70c72a36f6bd3e3129639c3c2ced23a83812bf90 100644 (file)
@@ -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"; }
 }
 
index 8f36fb38bd4d6087d5c06897af9ce2429025d4b5..100156c7d7bf31bcc0ce862ceb3ddcbeafcd039f 100644 (file)
@@ -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/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
deleted file mode 100644 (file)
index 3847685..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-\header{
-filename =      "gigue-cello.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Gigue";
-% opus =        "BWV 1008";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "gigue-urtext.ly";
-
-gigue_cello_global = \melodic{
-       \time 3/8;
-       \key f;
-       \clef bass;
-       \partial 8;
-       \skip 4.*31;
-       s4
-       \bar ":|:";
-       \skip 4.*44;
-       s4
-       \bar ":|";
-}
-
-gigue_cello_scripts = \melodic{
-}
-
-gigue_cello_staff = \type Staff <
-       \melodic \transpose c' \$gigue
-       \$gigue_cello_global
-       \$gigue_cello_scripts
->
-
-\score{
-       \$gigue_cello_staff
-       \include "scs-paper.ly";
-%broken
-       \midi{ \tempo 4 = 60; }
-       \header{ piece = "Gigue"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly
new file mode 100644 (file)
index 0000000..96ed306
--- /dev/null
@@ -0,0 +1,95 @@
+\header{
+filename =      "menuetto-alto.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Menuetto I";
+description =   "Transcribed for Alto";
+source =        "?";
+% opus =        "BWV 1008 no. 5";
+opus =  "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "menuetto-urtext.ly";
+
+menuetto_i_alto_global = \melodic{
+       \time 3/4;
+       \key f;
+       \clef alto;
+       \skip 2.*8;
+       \bar ":|:";
+       \clef violin;
+       \skip 2.*1;
+       \slurdotted
+       \skip 2.*3;
+       \clef alto;
+       \skip 2.*11;
+       s2._"Fine"
+       \bar ":|";
+}
+
+menuetto_i_alto_scripts = \melodic{
+       s2.
+       s8^"~"^1_2_4 s8*5
+       s2.*5
+       s4 s-\upbow s-\downbow
+       s2.-\upbow
+       s2.*5
+       s2 s4-\upbow
+       s4-\downbow s2
+       s2.*1
+       s2^0 s4
+       s2.*1
+       s4-\downbow s4-\upbow
+}
+
+menuetto_i_alto_staff = \type Staff <
+       \melodic \transpose c' \$menuetto_i
+       \$menuetto_i_alto_global
+%      \$menuetto_i_alto_scripts
+>
+
+\score{
+       \$menuetto_i_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 110; }
+}
+
+menuetto_ii_alto_global = \melodic{
+       \time 3/4;
+       \key D;
+       \clef alto;
+       \skip 2.*8;
+       \bar ":|:";
+       \skip 2.*1;
+       \slurdotted
+       \skip 2.*14;
+       s2._"Menuetto I da Capo"
+       \bar ":|";
+}
+
+menuetto_ii_alto_staff = \type Staff <
+       \melodic \transpose c' \$menuetto_ii
+       \$menuetto_ii_alto_global
+%      \$menuetto_ii_alto_scripts
+>
+
+\header{
+piece = "Menuetto II";
+opus =  "";
+}
+\score{
+       \$menuetto_ii_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 130; }
+}
+
index 461c6ffca8aefa1f78d73741a001ea79275af1c5..5d5f9c4d0d4bf8619a9fbf4b60677fcdd5423289 100644 (file)
@@ -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"; }
 }
 
index 76c93f5fb792b27ba93b67b66572fe2cf4f9d418..67e2f4412893fc04dcefb8edff2010c6ba8426b6 100644 (file)
@@ -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/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
deleted file mode 100644 (file)
index b2fee93..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-\header{
-filename =      "menuetto-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Menuetto I";
-description =   "Transcribed for Viola";
-source =        "?";
-% opus =        "BWV 1008 no. 5";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "menuetto-urtext.ly";
-
-menuetto_i_viola_global = \melodic{
-       \time 3/4;
-       \key f;
-       \clef alto;
-       \skip 2.*8;
-       \bar ":|:";
-       \clef violin;
-       \skip 2.*1;
-       \slurdotted
-       \skip 2.*3;
-       \clef alto;
-       \skip 2.*11;
-       s2._"Fine"
-       \bar ":|";
-}
-
-menuetto_i_viola_scripts = \melodic{
-       s2.
-       s8^"~"^1_2_4 s8*5
-       s2.*5
-       s4 s-\upbow s-\downbow
-       s2.-\upbow
-       s2.*5
-       s2 s4-\upbow
-       s4-\downbow s2
-       s2.*1
-       s2^0 s4
-       s2.*1
-       s4-\downbow s4-\upbow
-}
-
-menuetto_i_viola_staff = \type Staff <
-       \melodic \transpose c' \$menuetto_i
-       \$menuetto_i_viola_global
-%      \$menuetto_i_viola_scripts
->
-
-\score{
-       \$menuetto_i_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 110; }
-       \header{ piece = "Menuetto I"; }
-}
-
-menuetto_ii_viola_global = \melodic{
-       \time 3/4;
-       \key D;
-       \clef alto;
-       \skip 2.*8;
-       \bar ":|:";
-       \skip 2.*1;
-       \slurdotted
-       \skip 2.*14;
-       s2._"Menuetto I da Capo"
-       \bar ":|";
-}
-
-menuetto_ii_viola_staff = \type Staff <
-       \melodic \transpose c' \$menuetto_ii
-       \$menuetto_ii_viola_global
-%      \$menuetto_ii_viola_scripts
->
-
-\score{
-       \$menuetto_ii_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 130; }
-       \header{ piece = "Menuetto II"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly
new file mode 100644 (file)
index 0000000..2219165
--- /dev/null
@@ -0,0 +1,44 @@
+\header{
+filename =      "prelude-alto.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Pr\\'elude";          % duh
+opus =  "BWV 1008";
+% opus =        "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "prelude-urtext.ly";
+
+prelude_alto_global = \melodic{
+       \time 3/4;
+       \key f;
+       \clef alto;
+       \skip 2.*63;
+       \bar "|.";
+}
+
+prelude_alto_scripts = \melodic{
+}
+
+prelude_alto_staff = \type Staff <
+       \melodic \transpose c' \$prelude
+       \$prelude_alto_global
+       \$prelude_alto_scripts
+>
+
+\score{
+       \$prelude_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 40; }
+}
+
index fd071234ce202763aa4da609cb6c294d6cb2b1a6..d872e5ccb8bb449ec273926a6a888c1fb7ddc79b 100644 (file)
@@ -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"; }        
 }
 
index 2c31ae382dc8f8e0904df33fd39feb88b1e488d4..f93032b967f1ec3753147cf73ba6eed90b49b571 100644 (file)
@@ -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/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
deleted file mode 100644 (file)
index dd8ff62..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-\header{
-filename =      "prelude-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Pr\\'elude";                % duh
-opus =  "BWV 1008";
-% opus =        "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "prelude-urtext.ly";
-
-prelude_viola_global = \melodic{
-       \time 3/4;
-       \key f;
-       \clef alto;
-       \skip 2.*63;
-       \bar "|.";
-}
-
-prelude_viola_scripts = \melodic{
-}
-
-prelude_viola_staff = \type Staff <
-       \melodic \transpose c' \$prelude
-       \$prelude_viola_global
-       \$prelude_viola_scripts
->
-
-\score{
-       \$prelude_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 40; }
-       \header{ piece = "Pr\\'elude"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly
new file mode 100644 (file)
index 0000000..b39274e
--- /dev/null
@@ -0,0 +1,46 @@
+\header{
+filename =      "sarabande-alto.ly";
+title =         "Solo Cello Suites";
+subtitle = "Suite II";
+piece = "Sarabande";
+% opus =        "BWV 1008";
+opus =  "";
+composer =      "Johann Sebastian Bach (1685-1750)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+%{
+ Tested Features:breaking algorithm, chords, multivoice, accents, 
+ dotted slurs
+%}
+
+\version "1.0.0";
+
+\include "sarabande-urtext.ly";
+
+sarabande_alto_global = \melodic{
+       \time 3/4;
+       \key f;
+       \clef alto;
+       \skip 2.*12;
+       \bar ":|:";
+       \skip 2.*16;
+       \bar ":|";
+}
+
+sarabande_alto_scripts = \melodic{
+}
+
+sarabande_alto_staff = \type Staff <
+       \melodic \transpose c' \$sarabande
+       \$sarabande_alto_global
+       \$sarabande_alto_scripts
+>
+
+\score{
+       \$sarabande_alto_staff
+       \include "scs-paper.ly";
+       \midi{ \tempo 4 = 40; }
+}
+
index db57bec6c8d2c33e9500a4961ec1b220f445e7cc..4a8002713e64a9f88b148218cae86db2882516fe 100644 (file)
@@ -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"; }
 }
 
index 1a82029959d3d954d0b2f3fdc2e74b2039be60bf..00db06b77e333b0b60b9b10e0f051574f3551d1e 100644 (file)
@@ -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/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
deleted file mode 100644 (file)
index 864fb0d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-\header{
-filename =      "sarabande-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Sarabande";
-% opus =        "BWV 1008";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
-
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
-
-\version "1.0.0";
-
-\include "sarabande-urtext.ly";
-
-sarabande_viola_global = \melodic{
-       \time 3/4;
-       \key f;
-       \clef alto;
-       \skip 2.*12;
-       \bar ":|:";
-       \skip 2.*16;
-       \bar ":|";
-}
-
-sarabande_viola_scripts = \melodic{
-}
-
-sarabande_viola_staff = \type Staff <
-       \melodic \transpose c' \$sarabande
-       \$sarabande_viola_global
-       \$sarabande_viola_scripts
->
-
-\score{
-       \$sarabande_viola_staff
-       \include "scs-paper.ly";
-       \midi{ \tempo 4 = 40; }
-       \header{ piece = "Sarabande"; }
-}
-
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly
new file mode 100644 (file)
index 0000000..e0ba581
--- /dev/null
@@ -0,0 +1,7 @@
+\header{
+instrument="Alto";
+}
+
+instrument="alto";
+\include "solo-cello-suite-ii.ly"
+
diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly
deleted file mode 100644 (file)
index b6db279..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-\header{
-instrument="Alto";
-}
-
-instrument="viola";
-\include "solo-cello-suite-ii.ly"
-
diff --git a/mutopia/Makefile b/mutopia/Makefile
deleted file mode 100644 (file)
index b4ab368..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# mutopia/Makefile
-
-depth = ..
-
-SUBDIRS = J.S.Bach Coriolan W.A.Mozart
-
-examples=standchen gallina
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make
-include $(make-dir)/Mutopia.make
-
-EXTRA_DIST_FILES +=  TODO
-
-
-
diff --git a/mutopia/W.A.Mozart/GNUmakefile b/mutopia/W.A.Mozart/GNUmakefile
new file mode 100644 (file)
index 0000000..d8a0eeb
--- /dev/null
@@ -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 (file)
index d6b6388..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# mutopia/W.A.Mozart
-
-depth = ../..
-
-examples=cadenza
-LOCALMAKEFILES=Mutopia
-
-include $(depth)/make/Stepmake.make
-
-
diff --git a/po/GNUmakefile b/po/GNUmakefile
new file mode 100644 (file)
index 0000000..8dc71cb
--- /dev/null
@@ -0,0 +1,32 @@
+# title           makefile for po
+# file    po/Makefile 
+
+depth = ..
+
+NAME = lilypond
+MODULE_NAME = po
+
+PO_FILES = $(wildcard *.po)
+MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo))
+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
+
+default: $(MO_FILES)
+
+localinstall: $(MO_FILES)
+       for i in $(CATALOGS); do \
+         $(INSTALL) -d $(localedir)/$$i/LC_MESSAGES; \
+         $(INSTALL) -m 644 $(outdir)/$$i.mo \
+         $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
+       done
+
+localuninstall:
+       for i in $(CATALOGS); do \
+         rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
+         rmdir $(localedir)/$$i/LC_MESSAGES || true; \
+       done
+
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644 (file)
index e0c5503..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# title           makefile for po
-# file    po/Makefile 
-
-depth = ..
-
-NAME = lilypond
-MODULE_NAME = po
-
-PO_FILES = $(wildcard *.po)
-MO_FILES = $(addprefix $(outdir)/, $(PO_FILES:.po=.mo))
-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
-
-default: $(MO_FILES)
-
-localinstall: $(MO_FILES)
-       for i in $(CATALOGS); do \
-         $(INSTALL) -d $(localedir)/$$i/LC_MESSAGES; \
-         $(INSTALL) -m 644 $(outdir)/$$i.mo \
-         $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
-       done
-
-localuninstall:
-       for i in $(CATALOGS); do \
-         rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
-         rmdir $(localedir)/$$i/LC_MESSAGES || true; \
-       done
-
diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
new file mode 100644 (file)
index 0000000..0605eb6
--- /dev/null
@@ -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 (file)
index 34f2344..0000000
+++ /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
-
-
index 1af0885bd6fcf67442e79f3964248d223113598e..5280c852dff82d6e031cc2460d0a084c9d7c732e 100644 (file)
@@ -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
index 088d94b7222ec9fed09341100e9a97937dde481c..bd8c549ae3b47db98f1736ab55452c65f68c5387 100644 (file)
@@ -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:
index 6c4291c227e47baf755fa3cee06ea18affb34a45..ce491b816e47380d3d2e9bc82aa003f77c97b1f1 100644 (file)
@@ -1,4 +1,5 @@
-#!@PYTHON@
+
+# python version of mudela-book.  WIP.
 
 #  TODO: center option
 
diff --git a/stepmake/Documentation/GNUmakefile b/stepmake/Documentation/GNUmakefile
new file mode 100644 (file)
index 0000000..c49eec6
--- /dev/null
@@ -0,0 +1,24 @@
+# Documentation/Makefile
+
+depth = ..
+
+
+OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
+EXTRA_DIST_FILES = 
+SUBDIRS=topdocs
+
+
+STEPMAKE_TEMPLATES=documentation
+
+include $(depth)/make/stepmake.make 
+
+default: do-doc
+
+do-doc: $(OUTTXT_FILES)
+
+# ugh
+check-doc-deps: do-doc
+       true
+
+doc: do-doc
+
diff --git a/stepmake/Documentation/Makefile b/stepmake/Documentation/Makefile
deleted file mode 100644 (file)
index 6eacb8b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Documentation/Makefile
-
-depth = ..
-
-
-OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
-EXTRA_DIST_FILES = 
-SUBDIRS=topdocs
-
-
-MAKEFILES=Documentation
-
-include $(depth)/make/Stepmake.make 
-
-default: do-doc
-
-do-doc: $(OUTTXT_FILES)
-
-# ugh
-check-doc-deps: do-doc
-       true
-
-doc: do-doc
-
diff --git a/stepmake/Documentation/topdocs/GNUmakefile b/stepmake/Documentation/topdocs/GNUmakefile
new file mode 100644 (file)
index 0000000..d12c143
--- /dev/null
@@ -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 (file)
index 45af32d..0000000
+++ /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
index 5578428a8cb9b9b1fa811a891810b6521a1aa970..75d1d7809f17201490ee521a9fe4747223b2f1e2 100644 (file)
@@ -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
index eea0d29e8bb94ab5dcf85a84988a9a944c553c50..8d0a721a4ece6ce6c61946bd5e27d1d81bca68be 100644 (file)
@@ -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:
index f7e18136b68f94f74298850d85bf220357fa2ada..660b3aca0afb084db32bbb80322a5431d81601fa 100644 (file)
@@ -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/GNUmakefile b/stepmake/bin/GNUmakefile
new file mode 100644 (file)
index 0000000..36d1646
--- /dev/null
@@ -0,0 +1,10 @@
+# bin/Makefile
+
+depth = ..
+
+EXTRA_DIST_FILES = install-sh config.sub config.guess
+STEPMAKE_TEMPLATES=script
+
+include $(depth)/make/stepmake.make 
+
+
diff --git a/stepmake/bin/Makefile b/stepmake/bin/Makefile
deleted file mode 100644 (file)
index 918a59c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# bin/Makefile
-
-depth = ..
-
-EXTRA_DIST_FILES = install-sh config.sub config.guess
-MAKEFILES=Script
-
-include $(depth)/make/Stepmake.make 
-
-
index ee022aefa9f1c36aa24a13a9d1b8c8990646132f..420a69c374630d037c1bde6f08874c07d2d9f508 100755 (executable)
@@ -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 (file)
index 0000000..bb5632d
--- /dev/null
@@ -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/Makefile b/stepmake/make/Makefile
deleted file mode 100644 (file)
index 324c797..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# file    make/Makefile 
-
-depth = ..
-MAKEFILES=Makedir
-BLURBS=BLURB # COPERTINA FLAPTEKST
-
-include $(depth)/make/Stepmake.make 
-
-
-
diff --git a/stepmake/make/Rules.make b/stepmake/make/Rules.make
deleted file mode 100644 (file)
index 38dafc0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# title           package specific rules
-# file    make/Rules.lilymake.make
-
-$(outdir)/%: %.in
-       rm -f $@
-       cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
-
-
diff --git a/stepmake/make/STATE-VECTOR b/stepmake/make/STATE-VECTOR
deleted file mode 100644 (file)
index 845eee7..0000000
+++ /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 (file)
index 078bc37..0000000
+++ /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/Substitute.make b/stepmake/make/Substitute.make
deleted file mode 100644 (file)
index 8d5549b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# Substitute.make
-
-ATVARIABLES = \
-  BASH\
-  DATE\
-  date\
-  DIR_DATADIR\
-  PACKAGE\
-  package\
-  PERL\
-  PYTHON\
-  SHELL\
-  TOPLEVEL_VERSION\
-  step-bindir\
-  abs-step-bindir\
-
-
diff --git a/stepmake/make/Targets.make b/stepmake/make/Targets.make
deleted file mode 100644 (file)
index 5a6603f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# title           package specific targets
-# file    make/Targets.make
-
-.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
-
-check-www-doc:
-       $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
-       $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
-
-# check-rpm-doc-deps: 
-#      $(MAKE) -C $(depth)/Documentation gifs
-
-check-rpm-icons:
-
-check-make-deps:
-       $(MAKE) -C $(depth)/make
-
-# urg urg
-$(configheader): $(depth)/$(configuration).hh
-       cp $< $@
-
diff --git a/stepmake/make/Toplevel.make.in b/stepmake/make/Toplevel.make.in
deleted file mode 100644 (file)
index 67555b6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-Makefile-*-
-# title         specific top level makefile for StepMake
-
-# subdir level:
-#
-depth = .
-#
-
-# descent order into subdirectories:
-#
-SUBDIRS = bin make stepmake Documentation
-#
-
-# bootstrap stepmake:
-#
-#
-
-# list of distribution files:
-#
-SCRIPTS = configure aclocal.m4
-README_FILES = NEWS README TODO
-README_TXT_FILES = AUTHORS.txt INSTALL.txt
-EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES)  $(SCRIPTS) 
-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
-
-
diff --git a/stepmake/make/Toplevel_version.make b/stepmake/make/Toplevel_version.make
deleted file mode 100644 (file)
index 4a1e24e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Toplevel_version.make
-
-include $(depth)/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:
-TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL)
diff --git a/stepmake/make/User.make b/stepmake/make/User.make
deleted file mode 100644 (file)
index 598bc73..0000000
+++ /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/Variables.make b/stepmake/make/Variables.make
deleted file mode 100644 (file)
index 3c5a39d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# title           package specific variables
-# file    make/Variables.lilymake.make
-#
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
-#
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
-#
-
-# dummydeps
-#
-DUMMYDEPS=\
-
-#
-
-STEPMAKE_INCLUDES =
-STEPMAKE_LDFLAGS =
-STEPMAKE_LIBES =
-
diff --git a/stepmake/make/generic-rules.make b/stepmake/make/generic-rules.make
new file mode 100644 (file)
index 0000000..99d118e
--- /dev/null
@@ -0,0 +1,12 @@
+# 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/generic-targets.make b/stepmake/make/generic-targets.make
new file mode 100644 (file)
index 0000000..790abd7
--- /dev/null
@@ -0,0 +1,24 @@
+# title           package specific targets
+# file    make/Targets.make
+
+.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-www-doc check-rpm-icons
+
+check-html-deps:
+       $(MAKE) -C $(depth)/Documentation html
+
+check-www-doc:
+       $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs
+       $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
+
+# check-rpm-doc-deps: 
+#      $(MAKE) -C $(depth)/Documentation gifs
+
+check-rpm-icons:
+
+check-make-deps:
+       $(MAKE) -C $(depth)/make
+
+# urg urg
+$(configheader): $(depth)/$(configuration).hh
+       cp $< $@
+
diff --git a/stepmake/make/generic-vars.make b/stepmake/make/generic-vars.make
new file mode 100644 (file)
index 0000000..3c5a39d
--- /dev/null
@@ -0,0 +1,20 @@
+# title           package specific variables
+# file    make/Variables.lilymake.make
+#
+# do not change this file for site-wide extensions; please use 
+# make/$(outdir)/Site.make; 
+#
+# Any change in files in this directory (make/) would be distributed, if 
+# you do make dist 
+#
+
+# dummydeps
+#
+DUMMYDEPS=\
+
+#
+
+STEPMAKE_INCLUDES =
+STEPMAKE_LDFLAGS =
+STEPMAKE_LIBES =
+
index 695e5853336567c25e8daa77dbd7874396cde25f..c9f13884302bfd0f77bd658bda2b412e50008a58 100644 (file)
@@ -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
index fd9b7f974490c61200e86ce74c17a96072d2ee75..99900b82afe89a1f8226d8ba9fce532825d90b68 100644 (file)
@@ -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 (file)
index 0000000..9b114e1
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..5c12e73
--- /dev/null
@@ -0,0 +1,18 @@
+# Substitute.make
+
+include $(stepdir)/substitute-vars.make
+ATVARIABLES = \
+  BASH\
+  DATE\
+  date\
+  DIR_DATADIR\
+  PACKAGE\
+  package\
+  PERL\
+  PYTHON\
+  SHELL\
+  TOPLEVEL_VERSION\
+  step-bindir\
+  abs-step-bindir\
+
+
diff --git a/stepmake/make/toplevel-version.make b/stepmake/make/toplevel-version.make
new file mode 100644 (file)
index 0000000..c6711a8
--- /dev/null
@@ -0,0 +1,7 @@
+
+include $(depth)/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:
+TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL)
diff --git a/stepmake/make/toplevel.make.in b/stepmake/make/toplevel.make.in
new file mode 100644 (file)
index 0000000..4541064
--- /dev/null
@@ -0,0 +1,33 @@
+# -*-Makefile-*-
+# title         specific top level makefile for StepMake
+
+# subdir level:
+#
+depth = .
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = bin make stepmake Documentation
+#
+
+# bootstrap stepmake:
+#
+#
+
+# list of distribution files:
+#
+SCRIPTS = configure aclocal.m4
+README_FILES = NEWS README TODO
+README_TXT_FILES = AUTHORS.txt INSTALL.txt
+EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES)  $(SCRIPTS) 
+NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
+
+#
+
+# bootstrap stepmake:
+#
+STEPMAKE_TEMPLATES=toplevel
+include $(depth)/make/stepmake.make 
+#
+
diff --git a/stepmake/make/user.make b/stepmake/make/user.make
new file mode 100644 (file)
index 0000000..598bc73
--- /dev/null
@@ -0,0 +1,15 @@
+# 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/stepmake/C++.make b/stepmake/stepmake/C++.make
deleted file mode 100644 (file)
index 3e4b58d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-include $(stepdir)/C++_rules.make
-include $(stepdir)/C++_vars.make
diff --git a/stepmake/stepmake/C++_files.make b/stepmake/stepmake/C++_files.make
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/stepmake/stepmake/C++_rules.make b/stepmake/stepmake/C++_rules.make
deleted file mode 100644 (file)
index df26b06..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# title           C++ rules
-# file    make/C++_rules.make
-
-.SUFFIXES: .cc .o .hh .yy .ll  .dep
-
-# compile rules:
-#
-$(outdir)/%.o: %.cc
-       $(DO_CXX_COMPILE)
-
-$(outdir)/%.o: $(outdir)/%.cc
-       $(DO_CXX_COMPILE)
-
-$(outdir)/%.cc: %.yy
-       $(BISON) $<
-       mv $<.tab.c $@
-
-$(outdir)/%.hh: %.yy
-       $(BISON) -d $<
-       mv $<.tab.h $@
-       mv $<.tab.c $(basename $@).cc
-
-$(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
deleted file mode 100644 (file)
index 1bb8bf6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/stepmake/stepmake/C++_vars.make b/stepmake/stepmake/C++_vars.make
deleted file mode 100644 (file)
index f3d84a9..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# added two warnings that are treated by cygwin32's gcc 2.7.2 as errors.
-# huh, but still, no warnings even provoced with linux's gcc 2.7.2.1?
-
-# -pipe makes it go faster, but is not supported on all platforms. 
-# EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
-EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
-
-
-CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
-CXX_OUTPUT_OPTION = $< -o $@
-DO_CXX_COMPILE=$(DODEP) $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION)
-
-# template files:
-TCC_FILES := $(wildcard *.tcc)
-HH_FILES := $(wildcard *.hh)
-CC_FILES := $(wildcard *.cc)
-INL_FILES := $(wildcard *.icc)
-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)
-
-TAGS_FILES += $(TCC_FILES) $(HH_FILES) $(INL_FILES) $(CC_FILES)
diff --git a/stepmake/stepmake/C.make b/stepmake/stepmake/C.make
deleted file mode 100644 (file)
index 795296f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-include $(stepdir)/C_vars.make
-include $(stepdir)/C_rules.make
-
-
diff --git a/stepmake/stepmake/C_rules.make b/stepmake/stepmake/C_rules.make
deleted file mode 100644 (file)
index a2bf496..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# stepmake/C_rules.make
-
-.SUFFIXES: .c .o .h .y .l .dep
-
-$(outdir)/%.o: %.c
-       $(DO_C_COMPILE)
-
-$(outdir)/%.o: $(outdir)/%.c
-       $(DO_C_COMPILE)
-
-$(outdir)/%.c: %.y
-       $(BISON) $<
-#      mv $<.tab.c $@
-       mv parser.tab.c $@
-
-$(outdir)/%.h: %.y
-       $(BISON) -d $<
-#      mv $<.tab.h $@
-       mv parser.tab.h $@
-       mv parser.tab.c $(basename $@).c
-
-$(outdir)/%.c: %.l
-       $(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
deleted file mode 100644 (file)
index ea30561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#empty
diff --git a/stepmake/stepmake/C_vars.make b/stepmake/stepmake/C_vars.make
deleted file mode 100644 (file)
index 47d2eb7..0000000
+++ /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/Documentation.shared.make b/stepmake/stepmake/Documentation.shared.make
deleted file mode 100644 (file)
index 772bf32..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
diff --git a/stepmake/stepmake/Documentation_rules.make b/stepmake/stepmake/Documentation_rules.make
deleted file mode 100644 (file)
index 6e98289..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Docrules.make
-
-# special rules for the documentation section.
-# There are too many to add to the general rules
-
-.SUFFIXES: .1 .data .html .gif .xpm .tex .txt
-
-$(outdir)/%.gif: %.xpm
-       xpmtoppm $< | ppmtogif > $@
-
-$(outdir)/%.txt: $(outdir)/%.1
-       troff -man -Tascii $< | grotty -b -u -o > $@
-
-#urg should generalise and move Lilypond -> StepMake
-$(outdir)/%.html: %.data $(depth)/VERSION
-       $(PYTHON) $(step-bindir)/table-to-html.py --package=$(topdir) -o $@ $<
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
-
-$(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
-
diff --git a/stepmake/stepmake/Documentation_targets.make b/stepmake/stepmake/Documentation_targets.make
deleted file mode 100644 (file)
index 6c2ec85..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-do-doc: $(OUTTXT_FILES) 
-
-# ugh. FIXME
-ifeq ($(strip $(README_TOP_FILES)),)
-readme-top_FILES-html:
-readme-top_FILES-txt:
-else
-
-readme-top_FILES-txt:
-       $(foreach i, $(README_TOP_FILES), \
-         cp $(depth)/$(i) $(outdir)/$(i).txt && ) true
-       
-readme-top_FILES-html:
-       $(foreach i, $(README_TOP_FILES), \
-         $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \
-         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true
-endif
-
-local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
-       echo $^ > $(depth)/wwwlist
-
-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 $@
-
-$(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES)
-       $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
-
-localinstall: # $(INFO_FILES)
-       -$(INSTALL) -d $(infodir)
-       $(INFOINSTALL)
-localuninstall:
-       $(INFOINSTALL)
-
-endif
-
diff --git a/stepmake/stepmake/Documentation_vars.make b/stepmake/stepmake/Documentation_vars.make
deleted file mode 100644 (file)
index 465ab3d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Documentation files
-AT_FILES = $(BLURBS) # 
-at-dir = $(doc-dir)/
-at-ext = .in
-
-
-#
-YO_FILES := $(wildcard *.yo)
-POD_FILES := $(wildcard *.pod)
-TEXINFO_FILES := $(wildcard *.texinfo)
-OUTYO_FILES = $(addprefix $(outdir)/,$(YO_FILES))
-OUTPOD_FILES = $(addprefix $(outdir)/,$(POD_FILES))
-OUTTEXINFO_FILES = $(addprefix $(outdir)/,$(TEXINFO_FILES))
-
-#
-ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES)
-OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
-OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES)
-# OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
-# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
-OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES)))
-OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES)))
-
-
-ALL_SOURCES += $(ALL_DOC_FILES)
diff --git a/stepmake/stepmake/Executable.make b/stepmake/stepmake/Executable.make
deleted file mode 100644 (file)
index ae4493f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Executable.make
-
-include $(stepdir)/Executable_targets.make
diff --git a/stepmake/stepmake/Executable_rules.make b/stepmake/stepmake/Executable_rules.make
deleted file mode 100644 (file)
index 1bb8bf6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/stepmake/stepmake/Executable_targets.make b/stepmake/stepmake/Executable_targets.make
deleted file mode 100644 (file)
index 3feadc5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# Executable.make
-
-# dependency list of executable:
-#
-
-default: $(EXECUTABLE)
-
-$(EXECUTABLE): $(configheader) $(O_FILES) $(outdir)/version.hh $(MODULE_LIBES)
-       $(foreach a, $(MODULE_LIBS), $(MAKE) -C $a && ) true
-       $(LD_COMMAND) $(O_FILES) $(LOADLIBES)
-
-exe: $(EXECUTABLE)
-
-
-
-localinstall: installexe
-
-localuninstall: uninstallexe
-
-installexe: all
-       -$(INSTALL) -d $(bindir)
-       $(foreach a, $(EXECUTABLES), \
-               $(INSTALL) -m 755 $(outdir)/$(a)$(DOTEXE) $(bindir)/$(a)$(DOTEXE) && \
-               strip $(bindir)/$(a)$(DOTEXE) && ) true
-       $(foreach a, $(SEXECUTABLES), \
-               $(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true
-
-uninstallexe:
-       $(foreach a, $(EXECUTABLES), rm -f $(bindir)/$(a)$(DOTEXE) &&) true
-       $(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
-
-
-%/$(outdir)/library.a:
-       $(MAKE) -C $(dir $@)/.. default
diff --git a/stepmake/stepmake/Executable_vars.make b/stepmake/stepmake/Executable_vars.make
deleted file mode 100644 (file)
index 1bb8bf6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/stepmake/stepmake/Files.make b/stepmake/stepmake/Files.make
deleted file mode 100644 (file)
index 0d42a59..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# Files.make
-
-
-O_FILES = $(addprefix $(outdir)/,$(OBJECT_FILES))
-
-DEP_FILES := $(wildcard $(outdir)/*.dep)
-
-# (Why not Makefile too?)
-#
-#
-
-IN_FILES := $(wildcard *.in)
-SOURCE_FILES += $(IN_FILES)
-
-# Preprocessed .in documentation _FILES:
-#
-OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
-#
-
-ALL_SOURCES = $(SOURCE_FILES)
-
diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile
new file mode 100644 (file)
index 0000000..72d8b80
--- /dev/null
@@ -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/Generic_rules.make b/stepmake/stepmake/Generic_rules.make
deleted file mode 100644 (file)
index 97e210c..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# title           generic make rules
-# file    make/Rules.make
-
-# this is supposed to clear all suffixes:
-.SUFFIXES:
-
-$(outdir)/%: %.m4
-       $(M4) $< > $@
-
-%.dep:
-       touch $@
-
-%.gz: %
-       gzip -c9 $< > $@
-
-# bit docrules, these...
-$(outdir)/%.dvi: $(outdir)/%.tex
-       (cd $(outdir); tex \\nonstopmode \\input $(<F))
-
-$(outdir)/%.dvi: $(outdir)/%.latex
-       (cd $(outdir); \
-         latex \\nonstopmode \\input $(<F);\
-         bibtex $(basename $(<F));\
-         latex \\nonstopmode \\input $(<F);\
-         latex \\nonstopmode \\input $(<F);\
-       )
-
-$(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
deleted file mode 100644 (file)
index f701a37..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-# title           generic make targets
-# file    make/Targets.make
-
-.PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
-        po
-
-# target all:
-#
-all:    default
-       $(LOOP)
-
-
-# be careful about deletion.
-clean: localclean
-       -rm -f $(outdir)/*
-       $(LOOP)
-
-distclean: clean 
-       $(LOOP)
-       $(MAKE) local-distclean
-
-maintainerclean: 
-       $(LOOP)
-       $(MAKE) local-maintainerclean
-       $(MAKE) local-distclean
-
-include $(stepdir)/Po.make
-
-
-# configure:
-#
-config:
-       ./$(depth)/configure
-#
-
-
-# target help:
-#
-generic-help:
-       @echo -e "\
-Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
-Usage: $(MAKE) ["VARIABLE=value"]... [TARGET]\n\
-\n\
-Targets:\n"
-
-help: generic-help local-help
-       @echo -e "\
-  all         update everything\n\
-  clean       remove all genated stuff in $(oudir)\n\
-  config      rerun configure\n\
-  deb         build Debian package\n\
-  default     same as the empty target\n\
-  diff        generate patch: $(package)-$(TOPLEVEL_VERSION).diff.gz\n\
-  .           Options:\n\
-  .             from=0.1.74\n\
-  .             help==\n\
-  .             release==\n\
-  .             to=0.1.74.jcn2\n\
-  distclean   cleaner than clean (duh)\n\
-  doc         update all documentation\n\
-  doc++       make doc++ documentation\n\
-  exe         update all executables\n\
-  help        this help\n\
-  install     install programs and data (prefix=$(prefix))\n\
-  lib         update all libraries\n\
-  release     roll tarball and generate patch\n\
-  rpm         build RedHat package\n\
-  tar         same as dist\n\
-  TAGS        genarate tagfiles\n\
-  zip         build binary doze distribution\n\
-\n\
-Make may be invoked from any subdirectory\n\
-Note that all commands recurse into SUBSDIRS\n\
-"\
-#
-
-local-help:
-
-doc:
-#      $(MAKE) -C $(depth)/Documentation do-doc
-       $(MAKE) -C $(depth)/Documentation all
-
-
-# Ugh.  C++ specific.
-doc++:
-       (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
-
-
-
-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)
-       $(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
-
-       if [ "$(OUT_DIST_FILES)x" != "x" ] ; then \
-               mkdir $(distdir)/$(localdir)/out; \
-               $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out; \
-       fi
-       $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
-
-
-
-html: $(HTML_FILES)
-
-TAGS:
-       -if [ "$(TAGS_FILES)" != "" ]; then \
-               etags -CT $(TAGS_FILES) || \
-               ctags -h ".h.hh.tcc.icc" $(TAGS_FILES) $(ERROR_LOG); \
-       fi
-
-       $(LOOP)
-
-$(outdir)/version.hh: VERSION
-       sh ./$(step-bindir)/make-version.sh > $@
-
-
-# should this be in Rules?
-configure: configure.in aclocal.m4
-       autoconf - < $<> $@
-       chmod +x configure
-
-localclean:
-
-local-distclean:
-
-local-maintainerclean:
-
-install-strip:
-       $(MAKE) INSTALL="$(INSTALL) -s" install
-
-install: localinstall
-       $(LOOP)
-
-localinstall:
-
-uninstall: localuninstall
-       $(LOOP)
-
-localuninstall:
-
-installextradoc:
-       -$(INSTALL) -d $(prefix)/doc/$(package)
-       $(foreach i, $(EXTRA_DOC_FILES),\
-               cp -r $(i) $(prefix)/doc/$(package) &&) true
-
-WWW: local-WWW
-       $(LOOP)
-
-include $(stepdir)/Package.make
-include $(make-dir)/Targets.make
-
-include $(outdir)/dummy.dep $(DEP_FILES)
-
-$(outdir)/dummy.dep:
-       -mkdir $(outdir)
-       touch $(outdir)/dummy.dep
-
-
-check: local-check
-       $(LOOP)
-
-local-check:
diff --git a/stepmake/stepmake/Generic_vars.make b/stepmake/stepmake/Generic_vars.make
deleted file mode 100644 (file)
index b10f737..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-# title           generic variables
-# file    make/Variables.make
-#
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
-#
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
-
-# directory names:
-
-# depth from group-dir
-# not eh, normally used
-DEPTH = $(depth)/$(package-depth)
-
-topdir := $(shell cd $(depth); pwd)
-pwd := $(shell pwd)
-
-
-# derived names
-ifeq ($(distdir),)
-  distdir = $(depth)/$(outdir)/$(DIST_NAME)
-  DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
-endif
-distname = $(package)-$(TOPLEVEL_VERSION)
-
-
-
-
-# obsolete?
-makeout = $(depth)/make/$(outdir)
-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
-step-bindir = $(depth)/$(stepmake)/bin
-abs-step-bindir = $(topdir)/$(stepmake)/bin
-#
-group-dir = $(shell cd $(DEPTH)/..; pwd)
-release-dir = $(group-dir)/releases
-patch-dir = $(group-dir)/patches
-#
-# i have in $HOME/.rpmrc
-#     topdir: /home/fred/usr/src/Redhat
-#
-rpm-sources = $(release-dir)
-rpm-build = $(group-dir)/RedHat/BUILD
-#
-
-# hmm
-configheader=$(outdir)/config.hh
-
-# need to be defined in local Makefiles:
-#
-FOOBAR = 
-# the version:
-#
-ifneq ($(MY_PATCH_LEVEL),$(FOOBAR))
-VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL).$(MY_PATCH_LEVEL)
-else
-VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
-endif
-
-ifneq ($(TOPLEVEL_MY_PATCH_LEVEL),$(FOOBAR))
-TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL).$(TOPLEVEL_MY_PATCH_LEVEL)
-else
-TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)
-endif
-state-vector = $(make-dir)/STATE-VECTOR
-#
-
-# clean file lists:
-#
-ERROR_LOG = 2> /dev/null
-SILENT_LOG = 2>&1 >  /dev/null
-date := $(shell date +%x)      #duplicated?
-
-# compile and link options:
-#
-ARFLAGS = ru
-
-INCLUDES =  include $(outdir) $($(PACKAGE)_INCLUDES)
-LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
-
-MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
-LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)
-# urg: for windows ?
-# LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) -lstdc++
-#
-
-# macro compiler:
-#
-M4 = m4
-# 
-
-#
-LD_COMMAND = $(LD) $(LDFLAGS) -o $@
-#
-
-# dependencies:
-#
-depfile = $(outdir)/$(subst .o,.dep,$(notdir $@))#
-DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
-#
-
-
-# generic target names:
-#
-ifdef NAME
-EXECUTABLE = $(outdir)/$(NAME)$(EXE)
-else
-EXECUTABLE =
-endif
-
-EXECUTABLES = $(notdir $(EXECUTABLE))
-
-
-#
-
-#replace to do stripping of certain objects
-STRIPDEBUG=true 
-
-DIST_FILES=$(EXTRA_DIST_FILES) Makefile $(ALL_SOURCES)
-DOCDIR=$(depth)/$(outdir)
-
-
-STRIP=strip --strip-debug
-ifdef stablecc
- STABLEOBS=$(addprefix $(outdir)/,$(stablecc:.cc=.o))
-endif
-
-# substitute $(STRIP) in Site.make if you want stripping
-DO_STRIP=true
-
-
-LOOP=$(foreach i,  $(SUBDIRS),  $(MAKE) -C $(i) $@ &&) true
-
diff --git a/stepmake/stepmake/Include.make b/stepmake/stepmake/Include.make
deleted file mode 100644 (file)
index 5566cc8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include.make
-
-
-include $(stepdir)/Files.make
-
diff --git a/stepmake/stepmake/Install_outfiles.make b/stepmake/stepmake/Install_outfiles.make
deleted file mode 100644 (file)
index b4f2539..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Initial_outfiles.make
-
-localinstall: localinstall-files
-
-localinstall-files: $(INSTALLATION_OUT_FILES)
-       -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
-       $(foreach i, $(INSTALLATION_OUT_FILES), \
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true
-
-localuninstall: localuninstall-files
-
-localuninstall-files:
-       $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-               rm -f $(INSTALLATION_OUT_DIR)/$(i) && ) true
-       -rmdir $(INSTALLATION_OUT_DIR)
diff --git a/stepmake/stepmake/Install_outfiles.sub.make b/stepmake/stepmake/Install_outfiles.sub.make
deleted file mode 100644 (file)
index d5f9920..0000000
+++ /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/Installfiles.make b/stepmake/stepmake/Installfiles.make
deleted file mode 100644 (file)
index 58d10e3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Installfiles.make
-
-localinstall: localinstall-files
-
-localinstall-files:
-       -$(INSTALL) -d $(INSTALLATION_DIR)
-       $(foreach i,  $(INSTALLATION_FILES),\
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
-
-localuninstall: localuninstall-files
-
-localuninstall-files:
-       $(foreach i,  $(INSTALLATION_FILES),\
-               rm -f $(INSTALLATION_DIR)/$(i) && ) true
-       -rmdir $(INSTALLATION_DIR)
diff --git a/stepmake/stepmake/Intlrules.make b/stepmake/stepmake/Intlrules.make
deleted file mode 100644 (file)
index 41a4421..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LIBINTL=$(outdir)/libintl.a
-check-lib-intl:
-       $(MAKE) -C $(depth)/intl lib
-
-include $(stepdir)/C.make
-
diff --git a/stepmake/stepmake/Library.make b/stepmake/stepmake/Library.make
deleted file mode 100644 (file)
index c3a88cf..0000000
+++ /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 (file)
index 1bb8bf6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/stepmake/stepmake/Library_targets.make b/stepmake/stepmake/Library_targets.make
deleted file mode 100644 (file)
index f032aa5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# dependency list of library:
-#
-
-
-default: $(LIBRARY)
-
-$(outdir)/library.a: $(configheader) $(O_FILES) $(MODULE_LIBES)
-       $(AR_COMMAND) $(O_FILES)
-       $(RANLIB_COMMAND)
-
-$(SHAREDLIBRARY):  $(configheader) $(O_FILES) $(MODULE_LIBES)
-       $(LD_COMMAND) $(O_FILES) -o $@.$(VERSION)
-       rm -f $@
-       ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
-       ln -sf $(LIB_PREFIX)$(NAME).so.$(VERSION) $@
-
-
diff --git a/stepmake/stepmake/Library_vars.make b/stepmake/stepmake/Library_vars.make
deleted file mode 100644 (file)
index c749adb..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ugh ugh .
-ifndef LIB_SUFFIX
-LIB_SUFFIX = .a
-endif
-
-LIB_PREFIX = lib
-
-# librarian:
-#
-AR = ar
-AR_COMMAND = $(AR) $(ARFLAGS) $@
-
-# thanks to Nelson Beebe for this trick.
-RANLIB_COMMAND=$(RANLIB) || $(AR) || true
-
-# linker:
-LIBRARY = $(outdir)/library.a
-SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so
diff --git a/stepmake/stepmake/Makedir.shared.make b/stepmake/stepmake/Makedir.shared.make
deleted file mode 100644 (file)
index a693a1e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# stepmake/Makedir.shared.make
-
-# urg: stuff shared between yodl/lily/stepmake
diff --git a/stepmake/stepmake/Makedir_rules.make b/stepmake/stepmake/Makedir_rules.make
deleted file mode 100644 (file)
index ea30561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#empty
diff --git a/stepmake/stepmake/Makedir_targets.make b/stepmake/stepmake/Makedir_targets.make
deleted file mode 100644 (file)
index 3412294..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-spec: $(OUTSPEC_FILES)
-
-$(OUTSPEC_FILES): $(depth)/VERSION 
-$(OUTLSM_FILES): $(depth)/VERSION
diff --git a/stepmake/stepmake/Makedir_vars.make b/stepmake/stepmake/Makedir_vars.make
deleted file mode 100644 (file)
index adb1733..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-# stepmake/Makedir.shared.make
-# urg: stuff shared between yodl/lily/stepmake
-
-MAKE_FILES := $(wildcard *.make)
-LSM_FILES:= $(wildcard *.lsm.in)
-OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES)))
-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)
-
-# these two outdir FILES are distributed, since they make sense to have 
-# without running configure and make.
-
-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/Makefile b/stepmake/stepmake/Makefile
deleted file mode 100644 (file)
index b363430..0000000
+++ /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/Manual.make b/stepmake/stepmake/Manual.make
deleted file mode 100644 (file)
index 0e6206d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Manual.make
-
-MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION)))
-
-localinstall: $(MANGROFFS)
-       -$(INSTALL) -d $(mandir)/man$(SECTION)
-       $(INSTALL) -m 644 $(MANGROFFS) $(mandir)/man$(SECTION)
-
-
-localuninstall:
-       (cd  $(mandir)/man$(SECTION)/; rm -f $(MANGROFF))
-
-
-
-
diff --git a/stepmake/stepmake/Metafont_rules.make b/stepmake/stepmake/Metafont_rules.make
deleted file mode 100644 (file)
index 304512d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$(outdir)/%.dvi: %.mf
-       mf $<
-       gftodvi  $(basename $<)
-       mv   $(basename $<).dvi $(outdir)
-       rm $(basename $<).*gf
-
-$(outdir)/%.log: %.mf
-       mf $<
-       mv $(@F) $@
-       rm $(basename $< ).*gf
-
diff --git a/stepmake/stepmake/Metafont_targets.make b/stepmake/stepmake/Metafont_targets.make
deleted file mode 100644 (file)
index ea30561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#empty
diff --git a/stepmake/stepmake/Metafont_vars.make b/stepmake/stepmake/Metafont_vars.make
deleted file mode 100644 (file)
index 67600b8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-MF_FILES = $(wildcard *.mf)
-FONT_FILES = $(wildcard *[0-9].mf)
-EXTRA_DIST_FILES += $(MF_FILES)
-
diff --git a/stepmake/stepmake/Package.make b/stepmake/stepmake/Package.make
deleted file mode 100644 (file)
index d0d29f1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# stepmake/Package.make
-
-package-icon=$(outdir)/$(package)-icon.gif
-
-deb:
-       $(MAKE) -C $(depth)/debian
-
-# urg
-#(cd $(depth)/../debian/$(distname); \
-#  ln -sf debian DEBIAN; )
-# su -c 'dpkg-deb -b $(depth)/../debian/$(distname)'
-# urg, why aren't there any decent manual pages for dpkg or rpm?
-       su -c '(cd $(depth)/../debian; \
-         rm -rf $(distname) $(distname).deb;\
-         tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \
-         cd $(distname);\
-         dpkg-buildpackage -b; \
-       )'
-
-makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
-
-diff:
-       $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)
-
-release: 
-       $(PYTHON) $(step-bindir)/release.py --package=$(topdir)
-
-rpm: $(depth)/$(package-icon) dist
-       su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'
-
-update:
-       $(PYTHON) $(step-bindir)/update.py --package=$(topdir) $(makeflags)
-
-zip:
-       $(SHELL) $(step-bindir)/package-zip.sh $(topdir) $(prefix:/%=%)
-
diff --git a/stepmake/stepmake/Po.make b/stepmake/stepmake/Po.make
deleted file mode 100644 (file)
index c5e22d1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-####
-#### UGH!
-new-po:
-       if test -r $(po-dir); then \
-         rm -f $(po-dir)/$(outdir)/$(package).po; \
-         touch $(po-dir)/$(outdir)/$(package).po; \
-       fi
-
-ifeq ($(strip $(depth)),.)
-po: new-po
-       $(LOOP)
-localpo:
-       @true
-else
-po: localpo
-       $(LOOP)
-ALL_PO_SOURCES = $(ALL_C_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc)
-localpo:
-ifneq ($(strip $(ALL_PO_SOURCES)),)
-       @echo $(ALL_PO_SOURCES)
-       xgettext --c++ --default-domain=$(package) --join \
-        --output-dir=$(po-dir)/$(outdir) --add-comments \
-        --keyword=_ --keyword=_f $(ALL_PO_SOURCES)
-endif
-endif
-
-
-po-update: po
-       $(MAKE) -C $(po-dir) po-update
-
-show-po-changes:
-       $(MAKE) -C $(po-dir) show-po-changes
-
diff --git a/stepmake/stepmake/Po_rules.make b/stepmake/stepmake/Po_rules.make
deleted file mode 100644 (file)
index ccff7a1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# Porules.make
-
-.SUFFIXES: .po .mo
-
-$(outdir)/%.mo: %.po
-       $(MSGFMT) -o $@ $<
-
-# sed-pofile = sed 's/^. \#: .*//'
-sed-pofile = sed 's/^\#: .*//'
-sed-makestuff = sed 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
-sed-edstuff = sed 's/[ \.,adic0-9]*//' | sed 's/---//' | sort -u
-
-po-update:
-       $(foreach i,$(CATALOGS), \
-         rm -f $(po-dir)/$(outdir)/$(i).po; \
-         tupdate $(po-dir)/$(outdir)/$(package).po $(po-dir)/$(i).po \
-           > $(po-dir)/$(outdir)/$(i).po && ) true
-       $(foreach i,$(CATALOGS), \
-         changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i show-po-changes $(ERROR_LOG) | $(sed-makestuff)`; \
-         if test "$$changes" != "" ; then \
-           echo "*** Changes for language $$i; check po/$(outdir)/$$i.po ***"; \
-           echo -e "changes: \`$$changes'";\
-         fi; && ) true
-
-
-show-po-changes:
-       diff -e $(po-dir)/$(outdir)/$(LANGUAGE).po $(po-dir)/$(LANGUAGE).po \
-         | $(sed-pofile) | $(sed-edstuff)
diff --git a/stepmake/stepmake/Pod_rules.make b/stepmake/stepmake/Pod_rules.make
deleted file mode 100644 (file)
index dd5b7cc..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Pod_rules.make
-
-.SUFFIXES: .1 .5 .html .pod .txt
-
-pod2html=pod2html
-pod2groff=pod2man --center="$(PACKAGE_NAME) documentation" --section="0"\
-       --release="$(PACKAGE_NAME) $(VERSION)" $< > $@
-
-
-# perl 5.003/4
-POD2HTML_5003=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/ || true
-# urg, broken.  if you must have perl 5004, better install pod2html from 5003
-POD2HTML_5004=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
-
-do_pod2html=$($(POD2HTML_VERSION))
-
-$(outdir)/%.html: $(outdir)/%.pod $(depth)/VERSION
-       $(do_pod2html) 
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
-
-$(outdir)/%.pod: %.pod
-       cp $< $@
-
-$(outdir)/%.5: %.pod
-       $(pod2groff)
-
-$(outdir)/%.1: %.pod
-       $(pod2groff)
-
-$(outdir)/%.1: $(outdir)/%.pod
-       -$(pod2groff)
-
diff --git a/stepmake/stepmake/Rules.make b/stepmake/stepmake/Rules.make
deleted file mode 100644 (file)
index 503401b..0000000
+++ /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 (file)
index 845eee7..0000000
+++ /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/Script_rules.make b/stepmake/stepmake/Script_rules.make
deleted file mode 100644 (file)
index 1dca17b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Scripts.make
-
-
-
-
-$(outdir)/%: %.pl
-       cat $< | $(sed-atvariables) > $@
-       chmod 755 $@
-
-#FIXME.  Check for bash?
-$(outdir)/%: %.sh
-       cat $< | $(sed-atvariables) > $@
-       chmod 755 $@
-
-
-$(outdir)/%: %.py
-       cat $< | $(sed-atvariables) > $@
-       chmod 755 $@
-
diff --git a/stepmake/stepmake/Script_targets.make b/stepmake/stepmake/Script_targets.make
deleted file mode 100644 (file)
index 1ba75cd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SH_SCRIPTS)
diff --git a/stepmake/stepmake/Script_vars.make b/stepmake/stepmake/Script_vars.make
deleted file mode 100644 (file)
index ef705ba..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-PERL_SCRIPTS_IN := $(wildcard *.pl)
-PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=))
-SH_SCRIPTS_IN := $(wildcard *.sh)
-SH_SCRIPTS = $(addprefix $(outdir)/, $(SH_SCRIPTS_IN:.sh=))
-PYTHON_SCRIPTS_IN := $(wildcard *.py)
-PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=))
-ALL_SCRIPTS_IN = $(SH_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN)
-EXTRA_DIST_FILES += $(ALL_SCRIPTS_IN)
diff --git a/stepmake/stepmake/Substitute.make b/stepmake/stepmake/Substitute.make
deleted file mode 100644 (file)
index d4f1840..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# Substitute.make
-
-include $(make-dir)/Substitute.make
-
-sed-endline = sed 's!$$!\\!'
-sed-newline = sed 's!$$!\n!'
-sed-quotes = sed "s!\'!\\\&!g"
-sed-quote-line = sed 's!.*$$!\"&\"!'
-
-date := $(shell date '+%d%b%y'|tr '[a-z]' '[A-Z]' )
-DATE = $(date)
-
-# for all FILE in AT_FILES:
-# substitute occurrences of @FILE@ with contents $(at-dir)BLA$(at-ext)
-sed-atfiles = cat $(foreach i, $(AT_FILES), \
-  | sed '/@$i@/r $(at-dir)$i$(at-ext)' | sed 's%@$i@%%g')
-
-# for all VAR in ATVARIABLES
-# substitute occurrences of @VAR@ with $(VAR)
-sed-atvariables = cat $(foreach i, $(ATVARIABLES), | sed 's!@$i@!$($i)!g')
-
-# these are obsolete
-# use ATVARIABLES
-sed-date=sed 's!@DATE@!${date}!g'
-sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'
-sed-bash = sed 's!@BASH@!$(BASH)!'
-sed-dir-datadir = sed 's!@DIR_DATADIR@!$(DIR_DATADIR)!'
-sed-package=sed 's!@package@!${package}!g'
-sed-perl = sed 's!@PERL@!$(PERL)!'
-sed-python = sed 's!@PYTHON@!$(PYTHON)!'
-sed-sh = sed 's!@SH@!$(SH)!'
-sed-shell = sed 's!@SH@!$(SHELL)!' | sed 's!@BASH@!$(BASH)!'
-sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-sed-step-bindir = sed 's!@STEP_BINDIR@!$(pwd)/$(step-bindir)!'
-
diff --git a/stepmake/stepmake/Targets.make b/stepmake/stepmake/Targets.make
deleted file mode 100644 (file)
index ef3225b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-include $(stepdir)/Generic_targets.make
diff --git a/stepmake/stepmake/Template.make b/stepmake/stepmake/Template.make
deleted file mode 100644 (file)
index 739a02a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# THIS IS A TEMPLATE FOR SUB-PROJECT MAKEFILES
-# /Makefile
-
-# subdir level:
-#
-depth = ..
-#
-
-# identify module:
-#
-NAME = 
-#
-
-# descent order into subdirectories:
-#
-SUBDIRS =
-#
-
-# dependencies and linkage of custom libraries:
-#
-
-MODULE_LIBES = # $(depth)/lib $(depth)/flower
-#
-
-# list of extra distribution files:
-# Makefile, C++ and pod are dist'ed automatically
-EXTRA_DIST_FILES = 
-#
-
-# bootstrap stepmake:
-#
-include $(depth)/make/Stepmake.make 
-#
-
-# module compile settings: (not generally needed!)
-#
-EXTRA_CFLAGS =
-EXTRA_CXXFLAGS =
-EXTRA_LDFLAGS =
-#
-
-# main target of this module:
-#
-default: $(EXECUTABLE)
-# default: $(LIBRARY)
-#
-
-# EXECUTABLES=
-# include $(stepmake)/Executable.make
-
diff --git a/stepmake/stepmake/Texinfo_rules.make b/stepmake/stepmake/Texinfo_rules.make
deleted file mode 100644 (file)
index a1f223b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# Texinfo_rules.make
-
-.SUFFIXES: .1 .html .texinfo
-
-texi2man = $(step-bindir)/out/texi2man $< $@
-texi2html =\
-    rm -f $@.urg;\
-    cat $< | sed "s!@include.*!!" > $@.urg;\
-    $(TEXI2HTML) $@.urg;\
-    rm -f $@.urg;\
-    mv $(@F).urg.html $@;\
-    rm -f $(@F:%.html=%.html.urg_toc.html);\
-    add-URLs $@
-
-$(outdir)/%.1: %.texinfo
-       $(texi2man)
-
-# $(outdir)/%.info: %.texinfo
-#      $(MAKEINFO) -o $@ $<
-
-$(outdir)/%.info: $(outdir)/%.texinfo
-       $(MAKEINFO) -o $@ $<
-
-# $(outdir)/%.html: %.texinfo
-#      $(texi2html)
-#      add-html-footer --index $(depth)/../index.html $@
-
-# texi2html is as broken as pod2html 5004 :-) 
-# we'll have to use pod2html 5003 for now.
-# don't burn your .pod sources!
-#
-$(outdir)/%.html: $(outdir)/%.texinfo
-       $(texi2html)
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
-
-$(outdir)/%.texinfo: %.texinfo
-       cp $< $@
-
-$(outdir)/%.1: $(outdir)/%.texinfo
-       -$(texi2man)
-
diff --git a/stepmake/stepmake/Toplevel.make b/stepmake/stepmake/Toplevel.make
deleted file mode 100644 (file)
index 450eaf5..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*-Makefile-*-
-# title           Toplevel.make
-
-# override Variables.make:
-# do not dist ./Makefile (is copied from make/Toplevel.make)
-# 
-DIST_FILES := $(EXTRA_DIST_FILES) 
-#
-
-local-dist: configure 
-
-local-distclean: 
-       rm -f config.hh config.make Makefile config.cache \
-               config.status config.log index.html
-
-local-maintainerclean:
-       rm -f configure
-
-Makefile: 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
-
-local-WWW: #index.html 
-
-index.html: check-top-web NEWS
-       $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=Documentation/top-docs/out-www/index.html $@
-
-WWW-clean:
-       $(MAKE) CONFIGSUFFIX='www' clean
-
-
-dist:  check-state-vector
-       rm -rf $(distdir)
-       $(MAKE) local-dist $(distdir)
-       chmod -R a+r $(distdir)
-       chmod  a+x `find $(distdir) -type d -print` 
-       (cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-# ugh.
-# Can't compare "stage1" dist with "stage2" dist in this way?
-       -ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
-       rm -rf ./$(distdir)/
-
-local-help:
-       @echo -e "\
-  dist        roll tarball: $(outdir)/$(package)-$(TOPLEVEL_VERSION).tar.gz\n"
-
diff --git a/stepmake/stepmake/Variables.make b/stepmake/stepmake/Variables.make
deleted file mode 100644 (file)
index fdff819..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-include $(stepdir)/Generic_vars.make
diff --git a/stepmake/stepmake/Yodl_rules.make b/stepmake/stepmake/Yodl_rules.make
deleted file mode 100644 (file)
index 34542d3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Yodl_rules.make
-
-.SUFFIXES: .1 .5 .7 .dvi .html .latex .ps .texinfo .txt .yo
-
-$(outdir)/%.1: %.yo
-       $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.5: %.yo
-       $(YODL2MAN)  -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.7: %.yo
-       $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.html: %.yo
-       $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<
-       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $@ $(wildcard $(basename $@)[0-9][0-9].html)
-
-$(outdir)/%.latex: %.yo
-       $(YODL2LATEX) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.texinfo: %.yo
-       $(YODL2TEXINFO) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.txt: %.yo
-       $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
diff --git a/stepmake/stepmake/c++-files.make b/stepmake/stepmake/c++-files.make
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
@@ -0,0 +1 @@
+
diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
new file mode 100644 (file)
index 0000000..83b5425
--- /dev/null
@@ -0,0 +1,24 @@
+# title           C++ rules
+# file    make/C++_rules.make
+
+.SUFFIXES: .cc .o .hh .yy .ll  .dep
+
+# compile rules:
+#
+$(outdir)/%.o: %.cc
+       $(DO_CXX_COMPILE)
+
+$(outdir)/%.o: $(outdir)/%.cc
+       $(DO_CXX_COMPILE)
+
+$(outdir)/%.cc: %.yy
+       $(BISON) $<
+       mv $<.tab.c $@
+
+$(outdir)/%.hh: %.yy
+       $(BISON) -d $<
+       mv $<.tab.h $@
+       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 $< > $@
diff --git a/stepmake/stepmake/c++-targets.make b/stepmake/stepmake/c++-targets.make
new file mode 100644 (file)
index 0000000..751260e
--- /dev/null
@@ -0,0 +1,4 @@
+
+$(configheader): $(depth)/config.h
+       cp $< $@
+
diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
new file mode 100644 (file)
index 0000000..e2667e7
--- /dev/null
@@ -0,0 +1,28 @@
+
+# added two warnings that are treated by cygwin32's gcc 2.7.2 as errors.
+# huh, but still, no warnings even provoced with linux's gcc 2.7.2.1?
+
+# -pipe makes it go faster, but is not supported on all platforms. 
+# EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
+EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion
+
+
+CXXFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
+CXX_OUTPUT_OPTION = $< -o $@
+DO_CXX_COMPILE=$(DODEP) $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION)
+
+# template files:
+TCC_FILES := $(wildcard *.tcc)
+HH_FILES := $(wildcard *.hh)
+CC_FILES := $(wildcard *.cc)
+INL_FILES := $(wildcard *.icc)
+YY_FILES := $(wildcard *.yy)
+LL_FILES := $(wildcard *.ll)
+
+SOURCE_FILES+=$(YY_FILES) $(CC_FILES) $(INL_FILES) $(TCC_FILES) $(HH_FILES) $(LL_FILES)
+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
new file mode 100644 (file)
index 0000000..a2bf496
--- /dev/null
@@ -0,0 +1,26 @@
+# stepmake/C_rules.make
+
+.SUFFIXES: .c .o .h .y .l .dep
+
+$(outdir)/%.o: %.c
+       $(DO_C_COMPILE)
+
+$(outdir)/%.o: $(outdir)/%.c
+       $(DO_C_COMPILE)
+
+$(outdir)/%.c: %.y
+       $(BISON) $<
+#      mv $<.tab.c $@
+       mv parser.tab.c $@
+
+$(outdir)/%.h: %.y
+       $(BISON) -d $<
+#      mv $<.tab.h $@
+       mv parser.tab.h $@
+       mv parser.tab.c $(basename $@).c
+
+$(outdir)/%.c: %.l
+       $(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 (file)
index 0000000..6bdc692
--- /dev/null
@@ -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 (file)
index 0000000..5f9db66
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..1f6d773
--- /dev/null
@@ -0,0 +1,24 @@
+# Docrules.make
+
+# special rules for the documentation section.
+# There are too many to add to the general rules
+
+.SUFFIXES: .1 .data .html .gif .xpm .tex .txt
+
+$(outdir)/%.gif: %.xpm
+       xpmtoppm $< | ppmtogif > $@
+
+$(outdir)/%.txt: $(outdir)/%.1
+       troff -man -Tascii $< | grotty -b -u -o > $@
+
+#urg should generalise and move Lilypond -> StepMake
+$(outdir)/%.html: %.data $(depth)/VERSION
+       $(PYTHON) $(step-bindir)/table-to-html.py --package=$(topdir) -o $@ $<
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $@
+
+$(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
+
diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
new file mode 100644 (file)
index 0000000..58c668d
--- /dev/null
@@ -0,0 +1,42 @@
+
+default:
+
+do-doc: $(OUTTXT_FILES) 
+
+# ugh. FIXME
+ifeq ($(strip $(README_TOP_FILES)),)
+readme-top_FILES-html:
+readme-top_FILES-txt:
+else
+
+readme-top_FILES-txt:
+       $(foreach i, $(README_TOP_FILES), \
+         cp $(depth)/$(i) $(outdir)/$(i).txt && ) true
+       
+readme-top_FILES-html:
+       $(foreach i, $(README_TOP_FILES), \
+         $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \
+         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true
+endif
+
+local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
+       echo $^ > $(depth)/wwwlist
+
+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 $@
+
+$(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES)
+       $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
+
+localinstall: # $(INFO_FILES)
+       -$(INSTALL) -d $(infodir)
+       $(INFOINSTALL)
+localuninstall:
+       $(INFOINSTALL)
+
+endif
+
diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
new file mode 100644 (file)
index 0000000..465ab3d
--- /dev/null
@@ -0,0 +1,25 @@
+# Documentation files
+AT_FILES = $(BLURBS) # 
+at-dir = $(doc-dir)/
+at-ext = .in
+
+
+#
+YO_FILES := $(wildcard *.yo)
+POD_FILES := $(wildcard *.pod)
+TEXINFO_FILES := $(wildcard *.texinfo)
+OUTYO_FILES = $(addprefix $(outdir)/,$(YO_FILES))
+OUTPOD_FILES = $(addprefix $(outdir)/,$(POD_FILES))
+OUTTEXINFO_FILES = $(addprefix $(outdir)/,$(TEXINFO_FILES))
+
+#
+ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES)
+OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
+OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES)
+# OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
+# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
+OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES)))
+OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES)))
+
+
+ALL_SOURCES += $(ALL_DOC_FILES)
diff --git a/stepmake/stepmake/documentation.shared.make b/stepmake/stepmake/documentation.shared.make
new file mode 100644 (file)
index 0000000..79c67fb
--- /dev/null
@@ -0,0 +1,9 @@
+# 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
diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
new file mode 100644 (file)
index 0000000..1bb8bf6
--- /dev/null
@@ -0,0 +1 @@
+# empty
diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
new file mode 100644 (file)
index 0000000..3b175b5
--- /dev/null
@@ -0,0 +1,34 @@
+# Executable.make
+
+# dependency list of executable:
+#
+
+default: $(EXECUTABLE)
+
+$(EXECUTABLE): $(configheader) $(O_FILES) $(outdir)/version.hh $(MODULE_LIBES)
+       $(foreach a, $(MODULE_LIBS), $(MAKE) -C $a && ) true
+       $(LD_COMMAND) $(O_FILES) $(LOADLIBES)
+
+exe: $(EXECUTABLE)
+
+
+
+localinstall: installexe
+
+localuninstall: uninstallexe
+
+installexe: all
+       -$(INSTALL) -d $(bindir)
+       $(foreach a, $(EXECUTABLES), \
+               $(INSTALL) -m 755 $(outdir)/$(a) $(bindir)/$(a)$(DOTEXE) && \
+               strip $(bindir)/$(a)$(DOTEXE) && ) true
+       $(foreach a, $(SEXECUTABLES), \
+               $(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true
+
+uninstallexe:
+       $(foreach a, $(EXECUTABLES), rm -f $(bindir)/$(a)$(DOTEXE) &&) true
+       $(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
+
+
+%/$(outdir)/library.a:
+       $(MAKE) -C $(dir $@)/.. default
diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
new file mode 100644 (file)
index 0000000..1bb8bf6
--- /dev/null
@@ -0,0 +1 @@
+# empty
diff --git a/stepmake/stepmake/files.make b/stepmake/stepmake/files.make
new file mode 100644 (file)
index 0000000..2c25447
--- /dev/null
@@ -0,0 +1,20 @@
+# Files.make
+
+
+
+DEP_FILES := $(wildcard $(outdir)/*.dep)
+
+# (Why not Makefile too?)
+#
+#
+
+IN_FILES := $(wildcard *.in)
+SOURCE_FILES += $(IN_FILES)
+
+# Preprocessed .in documentation _FILES:
+#
+OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
+#
+
+ALL_SOURCES = $(SOURCE_FILES)
+
diff --git a/stepmake/stepmake/generic-rules.make b/stepmake/stepmake/generic-rules.make
new file mode 100644 (file)
index 0000000..fb05e13
--- /dev/null
@@ -0,0 +1,32 @@
+# title           generic make rules
+# file    make/Rules.make
+
+# this is supposed to clear all suffixes:
+.SUFFIXES:
+
+
+
+$(outdir)/%: %.m4
+       $(M4) $< > $@
+
+%.dep:
+       touch $@
+
+%.gz: %
+       gzip -c9 $< > $@
+
+# bit docrules, these...
+$(outdir)/%.dvi: $(outdir)/%.tex
+       (cd $(outdir); tex \\nonstopmode \\input $(<F))
+
+$(outdir)/%.dvi: $(outdir)/%.latex
+       (cd $(outdir); \
+         latex \\nonstopmode \\input $(<F);\
+         bibtex $(basename $(<F));\
+         latex \\nonstopmode \\input $(<F);\
+         latex \\nonstopmode \\input $(<F);\
+       )
+
+$(outdir)/%.ps: $(outdir)/%.dvi
+       dvips -ta4 -o $@ $<
+
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
new file mode 100644 (file)
index 0000000..413d1b3
--- /dev/null
@@ -0,0 +1,173 @@
+# title           generic make targets
+# file    make/Targets.make
+
+.PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
+        po
+
+# target all:
+#
+all:    default
+       $(LOOP)
+
+
+# be careful about deletion.
+clean: localclean
+       -rm -f $(outdir)/*
+       $(LOOP)
+
+distclean: clean 
+       $(LOOP)
+       $(MAKE) local-distclean
+
+maintainerclean: 
+       $(LOOP)
+       $(MAKE) local-maintainerclean
+       $(MAKE) local-distclean
+
+
+# configure:
+#
+config:
+       ./$(depth)/configure
+#
+
+
+# target help:
+#
+generic-help:
+       @echo -e "\
+Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
+Usage: $(MAKE) ["VARIABLE=value"]... [TARGET]\n\
+\n\
+Targets:\n"
+
+help: generic-help local-help
+       @echo -e "\
+  all         update everything\n\
+  clean       remove all genated stuff in $(oudir)\n\
+  config      rerun configure\n\
+  deb         build Debian package\n\
+  default     same as the empty target\n\
+  diff        generate patch: $(package)-$(TOPLEVEL_VERSION).diff.gz\n\
+  .           Options:\n\
+  .             from=0.1.74\n\
+  .             help==\n\
+  .             release==\n\
+  .             to=0.1.74.jcn2\n\
+  distclean   cleaner than clean (duh)\n\
+  doc         update all documentation\n\
+  doc++       make doc++ documentation\n\
+  exe         update all executables\n\
+  help        this help\n\
+  install     install programs and data (prefix=$(prefix))\n\
+  lib         update all libraries\n\
+  release     roll tarball and generate patch\n\
+  rpm         build RedHat package\n\
+  tar         same as dist\n\
+  TAGS        genarate tagfiles\n\
+  zip         build binary doze distribution\n\
+\n\
+Make may be invoked from any subdirectory\n\
+Note that all commands recurse into SUBSDIRS\n\
+"\
+#
+
+local-help:
+
+doc:
+#UGH
+       true #  $(MAKE) -C $(depth)/Documentation all
+
+
+# Ugh.  C++ specific.
+doc++:
+       (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
+
+
+
+
+
+local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
+       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)
+# 
+       case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
+               $(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \
+       esac
+
+       case "$(OUT_DIST_FILES)x" in x) ;; *) \
+               mkdir $(distdir)/$(localdir)/out; \
+               $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out;; \
+       esac
+       $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
+
+
+
+html: $(HTML_FILES)
+
+TAGS:
+       -if [ "$(TAGS_FILES)" != "" ]; then \
+               etags -CT $(TAGS_FILES) || \
+               ctags -h ".h.hh.tcc.icc" $(TAGS_FILES) $(ERROR_LOG); \
+       fi
+
+       $(LOOP)
+
+$(outdir)/version.hh: VERSION
+       sh ./$(step-bindir)/make-version.sh > $@
+
+
+# should this be in Rules?
+configure: configure.in aclocal.m4
+       autoconf - < $<> $@
+       chmod +x configure
+
+localclean:
+
+local-distclean:
+
+local-maintainerclean:
+
+install-strip:
+       $(MAKE) INSTALL="$(INSTALL) -s" install
+
+install: localinstall
+       $(LOOP)
+
+localinstall:
+
+uninstall: localuninstall
+       $(LOOP)
+
+localuninstall:
+
+installextradoc:
+       -$(INSTALL) -d $(prefix)/doc/$(package)
+       $(foreach i, $(EXTRA_DOC_FILES),\
+               cp -r $(i) $(prefix)/doc/$(package) &&) true
+
+WWW: local-WWW
+       $(LOOP)
+
+include $(stepdir)/package.make
+
+include $(outdir)/dummy.dep $(DEP_FILES)
+
+$(outdir)/dummy.dep:
+       -mkdir $(outdir)
+       touch $(outdir)/dummy.dep
+
+
+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
new file mode 100644 (file)
index 0000000..223c59d
--- /dev/null
@@ -0,0 +1,140 @@
+# title           generic variables
+# file    make/Variables.make
+#
+# do not change this file for site-wide extensions; please use 
+# make/$(outdir)/Site.make; 
+#
+# Any change in files in this directory (make/) would be distributed, if 
+# you do make dist 
+
+# directory names:
+
+# depth from group-dir
+# not eh, normally used
+DEPTH = $(depth)/$(package-depth)
+
+topdir := $(shell cd $(depth); pwd)
+pwd := $(shell pwd)
+
+
+# derived names
+ifeq ($(distdir),)
+  distdir = $(depth)/$(outdir)/$(DIST_NAME)
+  DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
+endif
+distname = $(package)-$(TOPLEVEL_VERSION)
+
+
+
+
+# obsolete?
+makeout = $(depth)/make/$(outdir)
+docout = $(depth)/Documentation/$(outdir)
+binout = $(depth)/bin/$(outdir)
+
+doc-dir = $(depth)/Documentation
+po-dir = $(depth)/po
+
+# sort-out which of these are still needed
+#
+$(package)_bindir = $(depth)/bin
+step-bindir = $(depth)/$(stepmake)/bin
+abs-step-bindir = $(topdir)/$(stepmake)/bin
+#
+group-dir = $(shell cd $(DEPTH)/..; pwd)
+release-dir = $(group-dir)/releases
+patch-dir = $(group-dir)/patches
+#
+# i have in $HOME/.rpmrc
+#     topdir: /home/fred/usr/src/Redhat
+#
+rpm-sources = $(release-dir)
+rpm-build = $(group-dir)/RedHat/BUILD
+#
+
+
+# need to be defined in local Makefiles:
+#
+FOOBAR = 
+# the version:
+#
+ifneq ($(MY_PATCH_LEVEL),$(FOOBAR))
+VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL).$(MY_PATCH_LEVEL)
+else
+VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
+endif
+
+ifneq ($(TOPLEVEL_MY_PATCH_LEVEL),$(FOOBAR))
+TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL).$(TOPLEVEL_MY_PATCH_LEVEL)
+else
+TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)
+endif
+
+
+
+# clean file lists:
+#
+ERROR_LOG = 2> /dev/null
+SILENT_LOG = 2>&1 >  /dev/null
+date := $(shell date +%x)      #duplicated?
+
+# compile and link options:
+#
+ARFLAGS = ru
+
+INCLUDES =  include $(outdir) $($(PACKAGE)_INCLUDES)
+LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
+
+MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
+LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)
+# urg: for windows ?
+# LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) -lstdc++
+#
+
+# macro compiler:
+#
+M4 = m4
+# 
+
+#
+LD_COMMAND = $(LD) $(LDFLAGS) -o $@
+#
+
+# dependencies:
+#
+depfile = $(outdir)/$(subst .o,.dep,$(notdir $@))#
+DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
+#
+
+
+# generic target names:
+#
+ifdef NAME
+EXECUTABLE = $(outdir)/$(NAME)$(EXE)
+else
+EXECUTABLE =
+endif
+
+EXECUTABLES = $(notdir $(EXECUTABLE))
+
+
+#
+
+#replace to do stripping of certain objects
+STRIPDEBUG=true 
+
+DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES)
+DOCDIR=$(depth)/$(outdir)
+
+
+STRIP=strip --strip-debug
+ifdef stablecc
+ STABLEOBS=$(addprefix $(outdir)/,$(stablecc:.cc=.o))
+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 (file)
index 0000000..df45bb7
--- /dev/null
@@ -0,0 +1,6 @@
+# Include.make
+
+
+
+
+
diff --git a/stepmake/stepmake/install-outfiles.make b/stepmake/stepmake/install-outfiles.make
new file mode 100644 (file)
index 0000000..b4f2539
--- /dev/null
@@ -0,0 +1,15 @@
+# Initial_outfiles.make
+
+localinstall: localinstall-files
+
+localinstall-files: $(INSTALLATION_OUT_FILES)
+       -$(INSTALL) -d $(INSTALLATION_OUT_DIR)
+       $(foreach i, $(INSTALLATION_OUT_FILES), \
+               $(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR) && )true
+
+localuninstall: localuninstall-files
+
+localuninstall-files:
+       $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
+               rm -f $(INSTALLATION_OUT_DIR)/$(i) && ) true
+       -rmdir $(INSTALLATION_OUT_DIR)
diff --git a/stepmake/stepmake/install-outfiles.sub.make b/stepmake/stepmake/install-outfiles.sub.make
new file mode 100644 (file)
index 0000000..f406025
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..58d10e3
--- /dev/null
@@ -0,0 +1,15 @@
+# Installfiles.make
+
+localinstall: localinstall-files
+
+localinstall-files:
+       -$(INSTALL) -d $(INSTALLATION_DIR)
+       $(foreach i,  $(INSTALLATION_FILES),\
+               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
+
+localuninstall: localuninstall-files
+
+localuninstall-files:
+       $(foreach i,  $(INSTALLATION_FILES),\
+               rm -f $(INSTALLATION_DIR)/$(i) && ) true
+       -rmdir $(INSTALLATION_DIR)
diff --git a/stepmake/stepmake/intlrules.make b/stepmake/stepmake/intlrules.make
new file mode 100644 (file)
index 0000000..8a44f88
--- /dev/null
@@ -0,0 +1,7 @@
+
+LIBINTL=$(outdir)/libintl.a
+check-lib-intl:
+       $(MAKE) -C $(depth)/intl lib
+
+include $(stepdir)/c.make
+
diff --git a/stepmake/stepmake/library-rules.make b/stepmake/stepmake/library-rules.make
new file mode 100644 (file)
index 0000000..1bb8bf6
--- /dev/null
@@ -0,0 +1 @@
+# empty
diff --git a/stepmake/stepmake/library-targets.make b/stepmake/stepmake/library-targets.make
new file mode 100644 (file)
index 0000000..f032aa5
--- /dev/null
@@ -0,0 +1,17 @@
+# dependency list of library:
+#
+
+
+default: $(LIBRARY)
+
+$(outdir)/library.a: $(configheader) $(O_FILES) $(MODULE_LIBES)
+       $(AR_COMMAND) $(O_FILES)
+       $(RANLIB_COMMAND)
+
+$(SHAREDLIBRARY):  $(configheader) $(O_FILES) $(MODULE_LIBES)
+       $(LD_COMMAND) $(O_FILES) -o $@.$(VERSION)
+       rm -f $@
+       ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
+       ln -sf $(LIB_PREFIX)$(NAME).so.$(VERSION) $@
+
+
diff --git a/stepmake/stepmake/library-vars.make b/stepmake/stepmake/library-vars.make
new file mode 100644 (file)
index 0000000..037f8ae
--- /dev/null
@@ -0,0 +1,19 @@
+
+#ugh ugh .
+ifndef LIB_SUFFIX
+LIB_SUFFIX = .a
+endif
+
+LIB_PREFIX = lib
+
+# librarian:
+#
+AR = ar
+AR_COMMAND = $(AR) $(ARFLAGS) $@
+
+# thanks to Nelson Beebe for this trick.
+RANLIB_COMMAND=$(RANLIB) $@ || $(AR) ts $@ || true
+
+# linker:
+LIBRARY = $(outdir)/library.a
+SHAREDLIBRARY=$(outdir)/$(LIB_PREFIX)$(NAME).so
diff --git a/stepmake/stepmake/makedir-rules.make b/stepmake/stepmake/makedir-rules.make
new file mode 100644 (file)
index 0000000..ea30561
--- /dev/null
@@ -0,0 +1 @@
+#empty
diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make
new file mode 100644 (file)
index 0000000..3412294
--- /dev/null
@@ -0,0 +1,6 @@
+
+
+spec: $(OUTSPEC_FILES)
+
+$(OUTSPEC_FILES): $(depth)/VERSION 
+$(OUTLSM_FILES): $(depth)/VERSION
diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
new file mode 100644 (file)
index 0000000..11387ce
--- /dev/null
@@ -0,0 +1,22 @@
+
+
+# stepmake/makedir.shared.make
+# urg: stuff shared between yodl/lily/stepmake
+
+MAKE_FILES := $(wildcard *.make)
+LSM_FILES:= $(wildcard *.lsm.in)
+OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES)))
+SPEC_FILES:= $(wildcard *.spec.in)
+OUTSPEC_FILES=$(addprefix $(outdir)/,$(basename $(SPEC_FILES)))
+OUT_DIST_FILES= $(strip $(OUTLSM_FILES) $(OUTSPEC_FILES))
+
+EXTRA_DIST_FILES += $(MAKE_FILES)
+
+# these two outdir FILES are distributed, since they make sense to have 
+# without running configure and make.
+
+AT_FILES = $(BLURBS) # 
+at-dir = $(doc-dir)/
+at-ext = .in
+
+
diff --git a/stepmake/stepmake/manual.make b/stepmake/stepmake/manual.make
new file mode 100644 (file)
index 0000000..0e6206d
--- /dev/null
@@ -0,0 +1,15 @@
+# Manual.make
+
+MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION)))
+
+localinstall: $(MANGROFFS)
+       -$(INSTALL) -d $(mandir)/man$(SECTION)
+       $(INSTALL) -m 644 $(MANGROFFS) $(mandir)/man$(SECTION)
+
+
+localuninstall:
+       (cd  $(mandir)/man$(SECTION)/; rm -f $(MANGROFF))
+
+
+
+
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
new file mode 100644 (file)
index 0000000..304512d
--- /dev/null
@@ -0,0 +1,12 @@
+
+$(outdir)/%.dvi: %.mf
+       mf $<
+       gftodvi  $(basename $<)
+       mv   $(basename $<).dvi $(outdir)
+       rm $(basename $<).*gf
+
+$(outdir)/%.log: %.mf
+       mf $<
+       mv $(@F) $@
+       rm $(basename $< ).*gf
+
diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make
new file mode 100644 (file)
index 0000000..ea30561
--- /dev/null
@@ -0,0 +1 @@
+#empty
diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make
new file mode 100644 (file)
index 0000000..67600b8
--- /dev/null
@@ -0,0 +1,5 @@
+
+MF_FILES = $(wildcard *.mf)
+FONT_FILES = $(wildcard *[0-9].mf)
+EXTRA_DIST_FILES += $(MF_FILES)
+
diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make
new file mode 100644 (file)
index 0000000..d0d29f1
--- /dev/null
@@ -0,0 +1,36 @@
+# stepmake/Package.make
+
+package-icon=$(outdir)/$(package)-icon.gif
+
+deb:
+       $(MAKE) -C $(depth)/debian
+
+# urg
+#(cd $(depth)/../debian/$(distname); \
+#  ln -sf debian DEBIAN; )
+# su -c 'dpkg-deb -b $(depth)/../debian/$(distname)'
+# urg, why aren't there any decent manual pages for dpkg or rpm?
+       su -c '(cd $(depth)/../debian; \
+         rm -rf $(distname) $(distname).deb;\
+         tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \
+         cd $(distname);\
+         dpkg-buildpackage -b; \
+       )'
+
+makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
+
+diff:
+       $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)
+
+release: 
+       $(PYTHON) $(step-bindir)/release.py --package=$(topdir)
+
+rpm: $(depth)/$(package-icon) dist
+       su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'
+
+update:
+       $(PYTHON) $(step-bindir)/update.py --package=$(topdir) $(makeflags)
+
+zip:
+       $(SHELL) $(step-bindir)/package-zip.sh $(topdir) $(prefix:/%=%)
+
diff --git a/stepmake/stepmake/po-rules.make b/stepmake/stepmake/po-rules.make
new file mode 100644 (file)
index 0000000..ccff7a1
--- /dev/null
@@ -0,0 +1,28 @@
+# Porules.make
+
+.SUFFIXES: .po .mo
+
+$(outdir)/%.mo: %.po
+       $(MSGFMT) -o $@ $<
+
+# sed-pofile = sed 's/^. \#: .*//'
+sed-pofile = sed 's/^\#: .*//'
+sed-makestuff = sed 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
+sed-edstuff = sed 's/[ \.,adic0-9]*//' | sed 's/---//' | sort -u
+
+po-update:
+       $(foreach i,$(CATALOGS), \
+         rm -f $(po-dir)/$(outdir)/$(i).po; \
+         tupdate $(po-dir)/$(outdir)/$(package).po $(po-dir)/$(i).po \
+           > $(po-dir)/$(outdir)/$(i).po && ) true
+       $(foreach i,$(CATALOGS), \
+         changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i show-po-changes $(ERROR_LOG) | $(sed-makestuff)`; \
+         if test "$$changes" != "" ; then \
+           echo "*** Changes for language $$i; check po/$(outdir)/$$i.po ***"; \
+           echo -e "changes: \`$$changes'";\
+         fi; && ) true
+
+
+show-po-changes:
+       diff -e $(po-dir)/$(outdir)/$(LANGUAGE).po $(po-dir)/$(LANGUAGE).po \
+         | $(sed-pofile) | $(sed-edstuff)
diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
new file mode 100644 (file)
index 0000000..f9307f8
--- /dev/null
@@ -0,0 +1,36 @@
+
+
+
+####
+#### UGH!
+new-po:
+       if test -r $(po-dir); then \
+         rm -f $(po-dir)/$(outdir)/$(package).po; \
+         touch $(po-dir)/$(outdir)/$(package).po; \
+       fi
+
+ifeq ($(strip $(depth)),.)
+po: new-po
+       $(LOOP)
+localpo:
+       @true
+else
+po: localpo
+       $(LOOP)
+ALL_PO_SOURCES = $(ALL_C_SOURCES) $(wildcard $(outdir)/*.hh) $(wildcard $(outdir)/*.cc)
+localpo:
+ifneq ($(strip $(ALL_PO_SOURCES)),)
+       @echo $(ALL_PO_SOURCES)
+       xgettext --c++ --default-domain=$(package) --join \
+        --output-dir=$(po-dir)/$(outdir) --add-comments \
+        --keyword=_ --keyword=_f $(ALL_PO_SOURCES)
+endif
+endif
+
+
+po-update: po
+       $(MAKE) -C $(po-dir) po-update
+
+show-po-changes:
+       $(MAKE) -C $(po-dir) show-po-changes
+
diff --git a/stepmake/stepmake/po-vars.make b/stepmake/stepmake/po-vars.make
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make
new file mode 100644 (file)
index 0000000..dd5b7cc
--- /dev/null
@@ -0,0 +1,32 @@
+# Pod_rules.make
+
+.SUFFIXES: .1 .5 .html .pod .txt
+
+pod2html=pod2html
+pod2groff=pod2man --center="$(PACKAGE_NAME) documentation" --section="0"\
+       --release="$(PACKAGE_NAME) $(VERSION)" $< > $@
+
+
+# perl 5.003/4
+POD2HTML_5003=$(POD2HTML) $< ; mv $(notdir $@) $(outdir)/ || true
+# urg, broken.  if you must have perl 5004, better install pod2html from 5003
+POD2HTML_5004=$(POD2HTML) --noindex --infile $< --outfile=$@;  sh $(depth)/bin/add-URLs.sh $@
+
+do_pod2html=$($(POD2HTML_VERSION))
+
+$(outdir)/%.html: $(outdir)/%.pod $(depth)/VERSION
+       $(do_pod2html) 
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
+
+$(outdir)/%.pod: %.pod
+       cp $< $@
+
+$(outdir)/%.5: %.pod
+       $(pod2groff)
+
+$(outdir)/%.1: %.pod
+       $(pod2groff)
+
+$(outdir)/%.1: $(outdir)/%.pod
+       -$(pod2groff)
+
diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
new file mode 100644 (file)
index 0000000..1dca17b
--- /dev/null
@@ -0,0 +1,19 @@
+# Scripts.make
+
+
+
+
+$(outdir)/%: %.pl
+       cat $< | $(sed-atvariables) > $@
+       chmod 755 $@
+
+#FIXME.  Check for bash?
+$(outdir)/%: %.sh
+       cat $< | $(sed-atvariables) > $@
+       chmod 755 $@
+
+
+$(outdir)/%: %.py
+       cat $< | $(sed-atvariables) > $@
+       chmod 755 $@
+
diff --git a/stepmake/stepmake/script-targets.make b/stepmake/stepmake/script-targets.make
new file mode 100644 (file)
index 0000000..1ba75cd
--- /dev/null
@@ -0,0 +1,2 @@
+
+all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SH_SCRIPTS)
diff --git a/stepmake/stepmake/script-vars.make b/stepmake/stepmake/script-vars.make
new file mode 100644 (file)
index 0000000..ef705ba
--- /dev/null
@@ -0,0 +1,10 @@
+
+
+PERL_SCRIPTS_IN := $(wildcard *.pl)
+PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=))
+SH_SCRIPTS_IN := $(wildcard *.sh)
+SH_SCRIPTS = $(addprefix $(outdir)/, $(SH_SCRIPTS_IN:.sh=))
+PYTHON_SCRIPTS_IN := $(wildcard *.py)
+PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=))
+ALL_SCRIPTS_IN = $(SH_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN)
+EXTRA_DIST_FILES += $(ALL_SCRIPTS_IN)
diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
new file mode 100644 (file)
index 0000000..6faf105
--- /dev/null
@@ -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 (file)
index 0000000..e69de29
diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
new file mode 100644 (file)
index 0000000..823ada2
--- /dev/null
@@ -0,0 +1,33 @@
+# Substitute.make
+
+sed-endline = sed 's!$$!\\!'
+sed-newline = sed 's!$$!\n!'
+sed-quotes = sed "s!\'!\\\&!g"
+sed-quote-line = sed 's!.*$$!\"&\"!'
+
+date := $(shell date '+%d%b%y'|tr '[a-z]' '[A-Z]' )
+DATE = $(date)
+
+# for all FILE in AT_FILES:
+# substitute occurrences of @FILE@ with contents $(at-dir)BLA$(at-ext)
+sed-atfiles = cat $(foreach i, $(AT_FILES), \
+  | sed '/@$i@/r $(at-dir)$i$(at-ext)' | sed 's%@$i@%%g')
+
+# for all VAR in ATVARIABLES
+# substitute occurrences of @VAR@ with $(VAR)
+sed-atvariables = cat $(foreach i, $(ATVARIABLES), | sed 's!@$i@!$($i)!g')
+
+# these are obsolete
+# use ATVARIABLES
+sed-date=sed 's!@DATE@!${date}!g'
+sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'
+sed-bash = sed 's!@BASH@!$(BASH)!'
+sed-dir-datadir = sed 's!@DIR_DATADIR@!$(DIR_DATADIR)!'
+sed-package=sed 's!@package@!${package}!g'
+sed-perl = sed 's!@PERL@!$(PERL)!'
+sed-python = sed 's!@PYTHON@!$(PYTHON)!'
+sed-sh = sed 's!@SH@!$(SH)!'
+sed-shell = sed 's!@SH@!$(SHELL)!' | sed 's!@BASH@!$(BASH)!'
+sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
+sed-step-bindir = sed 's!@STEP_BINDIR@!$(pwd)/$(step-bindir)!'
+
diff --git a/stepmake/stepmake/template.make b/stepmake/stepmake/template.make
new file mode 100644 (file)
index 0000000..45ae61e
--- /dev/null
@@ -0,0 +1,50 @@
+# THIS IS A TEMPLATE FOR SUB-PROJECT MAKEFILES
+# /Makefile
+
+# subdir level:
+#
+depth = ..
+#
+
+# identify module:
+#
+NAME = 
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS =
+#
+
+# dependencies and linkage of custom libraries:
+#
+
+MODULE_LIBES = # $(depth)/lib $(depth)/flower
+#
+
+# list of extra distribution files:
+# Makefile, C++ and pod are dist'ed automatically
+EXTRA_DIST_FILES = 
+#
+
+# bootstrap stepmake:
+#
+include $(depth)/make/stepmake.make 
+#
+
+# module compile settings: (not generally needed!)
+#
+EXTRA_CFLAGS =
+EXTRA_CXXFLAGS =
+EXTRA_LDFLAGS =
+#
+
+# main target of this module:
+#
+default: $(EXECUTABLE)
+# default: $(LIBRARY)
+#
+
+# EXECUTABLES=
+# include $(stepmake)/Executable.make
+
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
new file mode 100644 (file)
index 0000000..a1f223b
--- /dev/null
@@ -0,0 +1,41 @@
+# Texinfo_rules.make
+
+.SUFFIXES: .1 .html .texinfo
+
+texi2man = $(step-bindir)/out/texi2man $< $@
+texi2html =\
+    rm -f $@.urg;\
+    cat $< | sed "s!@include.*!!" > $@.urg;\
+    $(TEXI2HTML) $@.urg;\
+    rm -f $@.urg;\
+    mv $(@F).urg.html $@;\
+    rm -f $(@F:%.html=%.html.urg_toc.html);\
+    add-URLs $@
+
+$(outdir)/%.1: %.texinfo
+       $(texi2man)
+
+# $(outdir)/%.info: %.texinfo
+#      $(MAKEINFO) -o $@ $<
+
+$(outdir)/%.info: $(outdir)/%.texinfo
+       $(MAKEINFO) -o $@ $<
+
+# $(outdir)/%.html: %.texinfo
+#      $(texi2html)
+#      add-html-footer --index $(depth)/../index.html $@
+
+# texi2html is as broken as pod2html 5004 :-) 
+# we'll have to use pod2html 5003 for now.
+# don't burn your .pod sources!
+#
+$(outdir)/%.html: $(outdir)/%.texinfo
+       $(texi2html)
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@
+
+$(outdir)/%.texinfo: %.texinfo
+       cp $< $@
+
+$(outdir)/%.1: $(outdir)/%.texinfo
+       -$(texi2man)
+
diff --git a/stepmake/stepmake/toplevel-rules.make b/stepmake/stepmake/toplevel-rules.make
new file mode 100644 (file)
index 0000000..60a2599
--- /dev/null
@@ -0,0 +1,5 @@
+# -*-Makefile-*-
+# title           Toplevel_rules.make
+
+# empty
+
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
new file mode 100644 (file)
index 0000000..cf5b0a7
--- /dev/null
@@ -0,0 +1,47 @@
+# -*-Makefile-*-
+# title           Toplevel_targets.make
+
+local-dist: configure 
+
+local-distclean: 
+       rm -f config.hh config.make Makefile config.cache \
+               config.status config.log index.html
+
+local-maintainerclean:
+       rm -f configure
+
+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 $@
+
+aclocal.m4: $(stepdir)/../aclocal.m4
+       cp $< $@
+
+local-WWW: #index.html 
+
+index.html: check-top-web NEWS
+       $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=Documentation/top-docs/out-www/index.html $@
+
+WWW-clean:
+       $(MAKE) CONFIGSUFFIX='www' clean
+
+dist:  
+       rm -rf $(distdir)
+       $(MAKE) local-dist $(distdir)
+       chmod -R a+r $(distdir)
+       chmod  a+x `find $(distdir) -type d -print` 
+       (cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
+# ugh.
+# Can't compare "stage1" dist with "stage2" dist in this way?
+       -ln -f $(depth)/$(outdir)/$(distname).tar.gz $(release-dir)
+       rm -rf ./$(distdir)/
+
+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 (file)
index 0000000..9c642cf
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..34542d3
--- /dev/null
@@ -0,0 +1,26 @@
+# Yodl_rules.make
+
+.SUFFIXES: .1 .5 .7 .dvi .html .latex .ps .texinfo .txt .yo
+
+$(outdir)/%.1: %.yo
+       $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
+
+$(outdir)/%.5: %.yo
+       $(YODL2MAN)  -doutdir=$(outdir) --live-data=3 -o $@ $<
+
+$(outdir)/%.7: %.yo
+       $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
+
+$(outdir)/%.html: %.yo
+       $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<
+       $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $@ $(wildcard $(basename $@)[0-9][0-9].html)
+
+$(outdir)/%.latex: %.yo
+       $(YODL2LATEX) -doutdir=$(outdir) --live-data=3 -o $@ $<
+
+$(outdir)/%.texinfo: %.yo
+       $(YODL2TEXINFO) -doutdir=$(outdir) --live-data=3 -o $@ $<
+
+$(outdir)/%.txt: %.yo
+       $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
+
diff --git a/stepmake/stepmake/yolily-debian-rules.make b/stepmake/stepmake/yolily-debian-rules.make
new file mode 100644 (file)
index 0000000..74cd7be
--- /dev/null
@@ -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 (file)
index 0000000..9c19eb2
--- /dev/null
@@ -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 (file)
index 0000000..924bf91
--- /dev/null
@@ -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 (file)
index 0000000..5f02cca
--- /dev/null
@@ -0,0 +1,4 @@
+# Yolily_topdoc_rules.make
+
+# empty
+
diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make
new file mode 100644 (file)
index 0000000..447b7e4
--- /dev/null
@@ -0,0 +1,18 @@
+# Yolily_topdoc_targets.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/stepmake/yolily-topdoc-vars.make b/stepmake/stepmake/yolily-topdoc-vars.make
new file mode 100644 (file)
index 0000000..5ace651
--- /dev/null
@@ -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 (file)
index 0000000..b21868e
--- /dev/null
@@ -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 (file)
index 0000000..b451793
--- /dev/null
@@ -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 (file)
index 0000000..063229a
--- /dev/null
@@ -0,0 +1,5 @@
+# -*-Makefile-*-
+# title           Yolily_Toplevel_vars.make
+
+#empty 
+
diff --git a/test/GNUmakefile b/test/GNUmakefile
new file mode 100644 (file)
index 0000000..f4392fb
--- /dev/null
@@ -0,0 +1,17 @@
+# title           makefile for test
+# test/Makefile
+
+depth = ..
+
+NAME = lily-test
+MODULE_NAME = lily-test
+
+MODULE_CXXFLAGS = -I$(depth)/flower/include -I$(depth)/flower -I$(depth)/lily/include -I$(depth)/lily
+STEPMAKE_TEMPLATES=c++
+
+include $(depth)/make/stepmake.make
+
+# default: $(EXECUTABLE)
+
+# include $(stepdir)/Executable.make
+
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644 (file)
index e6215a3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# title           makefile for test
-# test/Makefile
-
-depth = ..
-
-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++
-
-include $(depth)/make/Stepmake.make
-
-# default: $(EXECUTABLE)
-
-# include $(stepdir)/Executable.make
-
diff --git a/tex/GNUmakefile b/tex/GNUmakefile
new file mode 100644 (file)
index 0000000..16b4702
--- /dev/null
@@ -0,0 +1,14 @@
+# tex/Makefile
+
+depth = ..
+
+
+TEX_FILES = $(wildcard *.tex)
+EXTRA_DIST_FILES =  $(TEX_FILES)
+
+INSTALLATION_DIR=$(TEXDIR)/lilypond
+INSTALLATION_FILES=$(TEX_FILES)
+
+include $(depth)/make/stepmake.make
+include $(stepdir)/installfiles.make
+
diff --git a/tex/Makefile b/tex/Makefile
deleted file mode 100644 (file)
index e38e514..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# tex/Makefile
-
-depth = ..
-
-
-TEX_FILES = $(wildcard *.tex)
-EXTRA_DIST_FILES =  $(TEX_FILES)
-
-INSTALLATION_DIR=$(TEXDIR)/lilypond
-INSTALLATION_FILES=$(TEX_FILES)
-
-include $(depth)/make/Stepmake.make
-include $(stepdir)/Installfiles.make
-