X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=39dddbf36cf2c8e48d79c0e65650a33dea1e6437;hb=ba201783bd4167640719c7b6713ac9d284a354da;hp=44946caef78cf06b94df6c8642ac7f730de13134;hpb=a1d72ee4c631e40978415d31666337beaebceabc;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 44946caef7..39dddbf36c 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,43 +1,84 @@
-# mf/Makefile
-
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost install install-out
+STEPMAKE_TEMPLATES=metafont install install-out
+LOCALSTEPMAKE_TEMPLATES=asciifont
+
+
+include $(depth)/make/stepmake.make 
+
+AF_FILES = $(wildcard *.af) 
+
+EXTRA_DIST_FILES += README feta.tex
+
+# don't try to make fonts from test files
+TEST_FILES = $(wildcard *test*.mf)
+FET_FILES = $(filter-out $(TEST_FILES),\
+  $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf))
+FONT_FILES = $(filter-out $(TEST_FILES),\
+$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf))
+
+XPM_FONTS = feta20 feta-nummer10 feta-braces20
+#CM_AFM_FILES = cmr10
 
-EXTRA_DIST_FILES += README feta.mp mfplain.ini
+$(outdir)/cmr10.afm:
+	-$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
+	-mv $(@F) $@
 
-FET_FILES = $(wildcard feta[0-9]*.mf)
+LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log) $(PARMESAN_FILES:.mf=.log))
+TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex) $(PARMESAN_FILES:.mf=.tex))
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(PARMESAN_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES)))
+TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 
-LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
-TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-XPM_FONTS = feta20
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) 
-TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) 
 
-ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
+# Make tfm files first, log files last, 
+# so that normally log files aren't made twice
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
-INSTALLATION_DIR=$(datadir)/mf/
-INSTALLATION_FILES=$(MF_FILES)
+INSTALLATION_DIR=$(datadir)/fonts/source
+INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5
 
 INSTALLATION_OUT_DIR1=$(datadir)/tex
 INSTALLATION_OUT_FILES1=$(TEXTABLES)
 
-INSTALLATION_OUT_DIR2=$(datadir)/afm
+INSTALLATION_OUT_DIR2=$(datadir)/fonts/afm
 INSTALLATION_OUT_FILES2=$(AFM_FILES)
 
-INSTALLATION_OUT_DIR3=$(datadir)/tfm
+INSTALLATION_OUT_DIR3=$(datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
+# comment this out if you don't want pfa's to be generated
+# making pfas takes a lot of CPU time. Let's skip it for now.
+#MAKE_PFA_FILES=1
+
+ifdef MAKE_PFA_FILES
+PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
+INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
+INSTALLATION_OUT_FILES4=$(PFA_FILES)
+
+INSTALLATION_OUT_DIR5=$(datadir)/dvips/
+INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
+
+pfa: $(PFA_FILES) 
+endif
+
 export MFINPUTS:=.:$(MFINPUTS)
-include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)
 
-$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-	$(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+$(outdir)/lilypond.map: 
+	echo $(FONT_FILES:.mf=) | awk -v RS=' ' '{print $$1 " TeX-" $$1 " <" $$1 ".pfa"}' > $@
+
+##
+## todo: this also depends on .tfm, FIXME.
+$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=.ly) $<
+
+local-clean:
+	rm -f mfplain.mem mfplain.log 
+	rm -f *.tfm *.log
+
 
-localclean:
-	rm -f mfplain.mem mfplain.log