lilypond-1.0.1

diff --git a/Documentation/man/Makefile b/Documentation/man/Makefile
index 1dc4f661ec44cfce2760ef9b2652042826e0bba2..a3157a3eb9c6334d689a50e4a615af1bb2b1ec17 100644 (file)
--- a/Documentation/man/Makefile
+++ b/Documentation/man/Makefile
@@ -1,19 +1,28 @@
+# Documentation/man/Makefile
 
 depth = ../..
 
-include $(depth)/make/Include.make
-include $(depth)/make/Docrules.make
+include $(depth)/make/Stepmake.make 
+
+include $(stepdir)/Documentation.vars.make
+include $(stepdir)/Documentation_rules.make
+
 SECTION=1
-MANTXT = $(addprefix $(outdir)/, $(addsuffix $(DOTTEXT),$(basename $(PODFILES) .pod)))
-MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(PODFILES) .pod)))
+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)))
 
 default: $(MANTXT) $(MANGROFF)
 
+texinfo: $(OUTTEXINFO_FILES)
 
 INSTALLATION_OUT_FILES=$(MANGROFF)
 INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION)
 
-include $(depth)/make/Install_outfiles.make
+include $(stepdir)/Install_outfiles.make
 
-local-WWW: $(OUTPODFILES:.pod=.html)
-       ls-latex  --title 'Manual pages for LilyPond' $(PODFILES)  > $(outdir)/index.html
+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/buildscripts/Makefile b/buildscripts/Makefile
new file mode 100644 (file)
index 0000000..7832495
--- /dev/null
+++ b/buildscripts/Makefile
@@ -0,0 +1,13 @@
+# bin/Makefile
+
+depth = ..
+
+include $(depth)/make/Stepmake.make 
+
+default: 
+
+EXTRA_DIST_FILES = ltconfig
+
+include $(stepdir)/Script_files.make
+
+

diff --git a/init/Makefile b/init/Makefile
index 25c1bd56a996e382eb44131364ce715883517300..8a72a4fd0e9e7da21534aed580d6fc215d5eb450 100644 (file)
--- a/init/Makefile
+++ b/init/Makefile
@@ -2,15 +2,14 @@
 
 depth = ..
 
-# generic stuff/Makefile
-#
-include ./$(depth)/make/Include.make
+include $(depth)/make/Stepmake.make 
+include $(make-dir)/Mutopia.make
 
-INIFILES = $(wildcard *.ly)
-DISTFILES = Makefile $(INIFILES)
+INI_FILES = $(FLY_FILES) $(LY_FILES)
+# DIST_FILES = Makefile $(INI_FILES)
 
-INSTALLATION_DIR=$(datadir)/lilypond/
-INSTALLATION_FILES=$(INIFILES)
+INSTALLATION_DIR=$(datadir)
+INSTALLATION_FILES=$(INI_FILES)
 
-include $(depth)/make/Installfiles.make
+include $(stepdir)/Installfiles.make
 

diff --git a/mutopia/J.S.Bach/Makefile b/mutopia/J.S.Bach/Makefile
index 8512f242c71dce6c47cecc1d2faa16b5ffce5168..2b734e09c62c38f4fe51902cb3ca3d4e0b45ad6c 100644 (file)
--- a/mutopia/J.S.Bach/Makefile
+++ b/mutopia/J.S.Bach/Makefile
@@ -1,22 +1,14 @@
 # mutopia/J.S.Bach/Makefile
 
-# subdir level:
-#
 depth = ../..
-#
 
-EXTRA_DISTFILES=preludes-3.lym4
+SUBDIRS = Petites-Preludes Solo-Cello-Suites 
 
-# descent order into subdirectories:
-#
-SUBDIRS = 
-# 
+include $(depth)/make/Stepmake.make
+include $(make-dir)/Mutopia.make
 
-# generic stuff/Makefile
-#
-include ./$(depth)/make/Mutopia.make
-#
+EXTRA_DIST_FILES=
 
-examples=scsii-cello wtk1-fugue2 preludes-2
+examples=wtk1-fugue2
 
-include $(depth)/make/WWW.make
+include $(stepdir)/WWW.make

diff --git a/mutopia/J.S.Bach/Petites-Preludes/Makefile b/mutopia/J.S.Bach/Petites-Preludes/Makefile
new file mode 100644 (file)
index 0000000..1a1020a
--- /dev/null
+++ b/mutopia/J.S.Bach/Petites-Preludes/Makefile
@@ -0,0 +1,12 @@
+# mutopia/J.S.Bach/Petites-Preludes/Makefile
+
+depth = ../../..
+
+include $(depth)/make/Stepmake.make
+include $(make-dir)/Mutopia.make
+
+EXTRA_DIST_FILES=
+
+examples=preludes-2
+
+include $(stepdir)/WWW.make

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile b/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
new file mode 100644 (file)
index 0000000..5f925d1
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
@@ -0,0 +1,12 @@
+# mutopia/J.S.Bach/Solo-Cello-Suites/Makefile
+
+depth = ../../..
+
+include $(depth)/make/Stepmake.make
+include $(make-dir)/Mutopia.make
+
+EXTRA_DIST_FILES=
+
+examples=scsii-cello
+
+include $(stepdir)/WWW.make

diff --git a/mutopia/Makefile b/mutopia/Makefile
index 7728ec9abbf0527eebbb0591df0e05e6412681d5..f788a8272449b6bb258538e1e04bc156eddffa9a 100644 (file)
--- a/mutopia/Makefile
+++ b/mutopia/Makefile
@@ -1,21 +1,16 @@
 # mutopia/Makefile
 
-# subdir level:
-#
 depth = ..
-#
 
-# descent order into subdirectories:
-#
 SUBDIRS = J.S.Bach Coriolan W.A.Mozart
-EXTRA_DISTFILES +=  TODO
+
+include $(depth)/make/Stepmake.make
+include $(make-dir)/Mutopia.make
+
+EXTRA_DIST_FILES +=  TODO
 
 examples=standchen gallina
 
 
-#
-# generic stuff/Makefile
-#
-include $(depth)/make/Mutopia.make
 
-include $(depth)/make/WWW.make
+include $(stepdir)/WWW.make

diff --git a/po/Makefile b/po/Makefile
new file mode 100644 (file)
index 0000000..d951b5a
--- /dev/null
+++ b/po/Makefile
@@ -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; \
+       done
+

diff --git a/stepmake/bin/Makefile b/stepmake/bin/Makefile
new file mode 100644 (file)
index 0000000..5ef2288
--- /dev/null
+++ b/stepmake/bin/Makefile
@@ -0,0 +1,10 @@
+# bin/Makefile
+
+depth = ..
+
+include $(depth)/make/Stepmake.make 
+
+EXTRA_DIST_FILES = install-sh config.sub config.guess
+
+include $(stepdir)/Scripts.make
+

diff --git a/stepmake/stepmake/Documentation.vars.make b/stepmake/stepmake/Documentation.vars.make
new file mode 100644 (file)
index 0000000..a12f31e
--- /dev/null
+++ b/stepmake/stepmake/Documentation.vars.make
@@ -0,0 +1,20 @@
+# Documentation files
+#
+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/Metafont.make b/stepmake/stepmake/Metafont.make
new file mode 100644 (file)
index 0000000..ed0e227
--- /dev/null
+++ b/stepmake/stepmake/Metafont.make
@@ -0,0 +1,15 @@
+MF_FILES = $(wildcard *.mf)
+FONT_FILES = $(wildcard *[0-9].mf)
+EXTRA_DIST_FILES += $(MF_FILES)
+
+$(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/Script_files.make b/stepmake/stepmake/Script_files.make
new file mode 100644 (file)
index 0000000..ef705ba
--- /dev/null
+++ b/stepmake/stepmake/Script_files.make
@@ -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.make b/stepmake/stepmake/Substitute.make
new file mode 100644 (file)
index 0000000..d4f1840
--- /dev/null
+++ b/stepmake/stepmake/Substitute.make
@@ -0,0 +1,35 @@
+# 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/tex/Makefile b/tex/Makefile
index 9a7713e43dba50d2ee7b3bdd10c6dd5e93603f66..13480c8146e221ac43df67de8e0cd0132626beae 100644 (file)
--- a/tex/Makefile
+++ b/tex/Makefile
@@ -1,20 +1,14 @@
 # tex/Makefile
 
-# subdir level:
-#
 depth = ..
-#
-#
-include ./$(depth)/make/Include.make
-#
 
-# list of distribution files:
-# 
-TEXFILES = $(wildcard *.tex)
-DISTFILES = Makefile $(TEXFILES)
-#
+include $(depth)/make/Stepmake.make
+
+TEX_FILES = $(wildcard *.tex)
+DIST_FILES = Makefile $(TEX_FILES)
 
 INSTALLATION_DIR=$(TEXDIR)/lilypond
-INSTALLATION_FILES=$(TEXFILES)
+INSTALLATION_FILES=$(TEX_FILES)
+
+include $(stepdir)/Installfiles.make
 
-include $(depth)/make/Installfiles.make