lilypond-1.0.1

diff --git a/mf/Makefile b/mf/Makefile
index 940ab88ced4774b0dd852ed3fd023107a8d3b5b4..42c18fec889c38920159a497a17b2c0c14a14ca1 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -1,62 +1,45 @@
 # mf/Makefile
 
-# subdir level:
-#
 depth = ..
-#
-#
-include ./$(depth)/make/Include.make
-#
 
-# list of distribution files:
+include $(depth)/make/Stepmake.make 
+include $(stepdir)/Metafont.make
 
-TEXFILES = $(wildcard *.tex)
-MFFILES = $(wildcard *.mf)
-EXTRA_DISTFILES =   TODO README  $(MFFILES)
+TEX_FILES = $(wildcard *.tex)
+EXTRA_DIST_FILES += TODO README
 
-lyout = $(outdir)/
-texout = $(outdir)/
-
-FONT_FILES = $(wildcard *[0-9].mf)
 FET_FILES = $(wildcard feta[0-9]*.mf)
 
-LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
-LOGFILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
-TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
-
-default: $(LYTABLES) $(TEXTABLES) $(LOGFILES)
-
+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)
+default: $(ALL_GEN_FILES)
 
-$(outdir)/%.dvi: %.mf
-       mf $<
-       gftodvi  $(basename $<)
-       mv   $(basename $<).dvi $(outdir)
-       rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
-       mf $<
-       mv $(@F) $@
-       rm $(basename $< ).*gf
+$(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) $<
 
-$(lyout)/%.ly $(texout)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-       $(PYTHON) $(depth)/bin/mf-to-table.py --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(lyout)/$(<F:.log=.ly) --tex $(texout)/$(<F:.log=.tex) $<
 
+TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(stepdir)/Install_outfiles.sub.make $@
 
-lyouts:
+AFMINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(AFM_FILES)" -f $(stepdir)/Install_outfiles.sub.make $@
 
-TEXINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(TEXDIR)/lilypond depth=.. INSTALLATION_OUT_FILES="$(TEXTABLES)" -f $(depth)/make/Install_outfiles.sub.make $@
+LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir) INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(stepdir)/Install_outfiles.sub.make $@
 
-LYINSTALL=$(MAKE) depth=.. INSTALLATION_OUT_DIR=$(datadir)/lilypond INSTALLATION_OUT_FILES="$(LYTABLES)" -f $(depth)/make/Install_outfiles.sub.make $@
-
-localinstall:
+localinstall: $(ALL_GEN_FILES)
        $(TEXINSTALL)
        $(LYINSTALL)
+       $(AFMINSTALL)
 
 localuninstall:
        $(TEXINSTALL)
        $(LYINSTALL)
+       $(AFMINSTALL)
 
 INSTALLATION_DIR=$(MFDIR)/public/lilypond
-INSTALLATION_FILES=$(MFFILES)
+INSTALLATION_FILES=$(MF_FILES)
+
+include $(stepdir)/Installfiles.make
 
-include $(depth)/make/Installfiles.make