lilypond-1.0.1

diff --git a/Documentation/Makefile b/Documentation/Makefile
index e8fe751ce96a2fdd846bbc78e8319634991afac6..5b2a1f602392aa26d02623f3b2070202cdd83bf0 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,67 +1,23 @@
 # Documentation/Makefile
 
-# subdir level:
-#
 depth = ..
-#
 
-# identify module:
-#
 NAME = Documentation
-SUBDIRS=man tex 
+SUBDIRS=man tex pictures topdocs
 
-#
-
-# generic variables:
-#
-include ./$(depth)/make/Variables.make 
-include ./$(depth)/make/Version.make
-include ./$(depth)/make/Files.make 
-include ./$(depth)/make/Docrules.make
-#
-
-
-#
-DATAFILES = $(wildcard *.data)
-TEXTFILES = $(OUTPODFILES:.pod=$(DOTTEXT))
-GROFFFILES = $(OUTPODFILES:.pod=.1)
-HTMLFILES = $(OUTPODFILES:.pod=.html) $(datafiles)
+include $(depth)/make/Stepmake.make 
 
 default: do-doc
 
-#
-# list of distribution files:
-#
-XPMS=$(wildcard *.xpm)
-giffiles = $(addprefix $(outdir)/,$(XPMS:.xpm=.gif))
-
-gifs: $(giffiles)
-
-datafiles = $(addprefix $(outdir)/,$(DATAFILES:.data=.html))
-
-EXTRA_DISTFILES = $(XPMS) vocabulary.data vocabulary-forms.el  automake.urgh\
-       gnu-music-history
-
-# don't do DVI files. They can only be made if lily is installed
-do-doc: $(TEXTFILES)
-
-readme-topfiles:
-       cd $(depth); for i in $(README_TOPFILES); do \
-       ln -f $$i Documentation/$(outdir)/$$i$(DOTTEXT); done
-
-README_TOPFILES=NEWS DEDICATION TODO ANNOUNCE-0.1
-README_TXTFILES=$(addprefix $(outdir)/,$(addsuffix $(DOTTEXT), $(README_TOPFILES)))
+README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1
 
-local-WWW: $(HTMLFILES) readme-topfiles $(README_TXTFILES) $(giffiles)
+EXTRA_DIST_FILES = gnu-music-history TODO 
 
-# generic targets and rules:
-#
-include $(depth)/make/Targets.make
-include $(depth)/make/Rules.make
+BLURBS=BLURB COPERTINA FLAPTEKST
+# INFO_FILES = $(outdir)/$(package).info
 
-# ugh
-check-doc-deps: do-doc
-       @echo # hi
+OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo
 
-doc: do-doc
+texinfo: $(OUTTEXINFO_FILES)
 
+include $(stepdir)/Documentation.shared.make

diff --git a/stepmake/stepmake/Documentation.shared.make b/stepmake/stepmake/Documentation.shared.make
new file mode 100644 (file)
index 0000000..1a8ee9b
--- /dev/null
+++ b/stepmake/stepmake/Documentation.shared.make
@@ -0,0 +1,48 @@
+# 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...
+
+AT_FILES = $(BLURBS) # 
+at-dir = $(doc-dir)/
+at-ext = .in
+
+include $(stepdir)/Documentation.vars.make
+include $(stepdir)/Documentation_rules.make
+
+do-doc: $(OUTTXT_FILES) 
+
+# ugh. FIXME
+ifeq ($(strip $(README_TOP_FILES)),)
+readme-top_FILES-html:
+else
+
+readme-top_FILES-html:
+       for i in $(README_TOP_FILES); do \
+         $(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; \
+       done
+endif
+
+local-WWW:  readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
+
+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/Executable.make b/stepmake/stepmake/Executable.make
new file mode 100644 (file)
index 0000000..1516ad7
--- /dev/null
+++ b/stepmake/stepmake/Executable.make
@@ -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