lilypond-0.1.18

diff --git a/mf/Makefile b/mf/Makefile
index 556d777dd776f1bb9ab9efc97d4d4d93fed7e616..26bc3f01df3f20ba50532cd0cc02e27778f1fe0c 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -16,23 +16,33 @@ EXTRA_DISTFILES = $(MFFILES) $(TEXFILES) TODO
 #
 
 FONT_FILES = $(wildcard *[0-9].mf)
-tableout = $(depth)/init
-TABLES = $(addprefix $(tableout)/, $(FONT_FILES:.mf=.ly))
+FET_FILES = $(wildcard font-en-tja*[0-9].mf)
+
+lyout = $(depth)/init
+texout = $(depth)/tex
+LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
+TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 #
 
-all: $(TABLES)
+all: $(LYTABLES) $(TEXTABLES)
+
+localclean:
+       rm -f $(LYTABLES) $(TEXTABLES)
 
-# localclean:
-#      rm -f $(TABLES)
+$(outdir)/%.dvi: %.mf
+       mf $<
+       gftodvi  $(basename $<)
+       mv   $(basename $<).dvi $(outdir)
+       rm $(basename $<).*gf
 
 $(outdir)/%.log: %.mf
        mf $<
        mv $(@F) $@
-       rm $(shell basename $< .mf).*gf
+       rm $(basename $< ).*gf
+
+$(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.log
+       mf-to-table -l $(lyout)/$(<F:.log=.ly) -t $(texout)/$(<F:.log=.tex) $<
 
-$(tableout)/%.ly: $(outdir)/%.log
-       mf-to-table -o $@ $<
-       
 localinstall:
        $(INSTALL) -d $(MFDIR)/lilypond
        $(INSTALL) -m 644 $(MFFILES) $(MFDIR)/lilypond/
@@ -43,9 +53,14 @@ localuninstall:
 
 # dependencies:
 #
-$(tableout)/dyn10.ly: autometric.mf ital-f.mf ital-m.mf ital-p.mf ital-r.mf ital-s.mf ital-z.mf dyn10.mf
-$(tableout)/font-en-tja16.ly: autometric.mf bolletjes.mf font-en-tja16.mf
-$(tableout)/font-en-tja20.ly: autometric.mf bolletjes.mf font-en-tja20.mf
-#
+include $(outdir)/mfdeps
+
+
+
+$(outdir)/mfdeps: $(FONT_FILES)
+# do something silly to avoid barfs if python not installed.
+       echo > $@
+       python $(depth)/bin/mf-deps.py  $^ >> $@
+