''

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 22eb45ecd0c5070261382aca0b7df0f69e83b3ec..0a576e5467aa102e61dc4564d08d8a5fdbec9585 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -27,39 +27,43 @@ $(outdir)/cmr10.afm:
 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)))
+ENC_FILES=$(TEXTABLES:.tex=.enc)
 TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 
 
 # 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)
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
-INSTALLATION_DIR=$(datadir)/mf/
+INSTALLATION_DIR=$(datadir)/fonts/source
 INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 4
+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)
-INSTALLATION_OUT_DIR4=$(datadir)/pfa
-INSTALLATION_OUT_FILES4=$(PFA_FILES) lilypond.map
 
-pfa: $(PFA_FILES) 
+ifdef MAKE_PFA_FILES
+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
+
 endif
 
 export MFINPUTS:=.:$(MFINPUTS)
@@ -67,15 +71,17 @@ export MFINPUTS:=.:$(MFINPUTS)
 default: $(ALL_GEN_FILES)
 
 $(outdir)/lilypond.map: 
-       echo $(FONT_FILES:.mf=) | awk -v RS=' ' '{print $$1 " TeX-" $$1 " <" $$1 ".pfa"}' > $@
+       echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \
+               sed 's/\(.*\)/\1 \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) $<
+$(outdir)/%.afm  $(outdir)/%.enc  $(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)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
 
 local-clean:
        rm -f mfplain.mem mfplain.log 
        rm -f *.tfm *.log
 
+pfa: $(PFA_FILES)