From 12e7cacbb549cab560634e65eec1cb4c88809662 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 5 Mar 2003 17:57:50 +0000
Subject: [PATCH] * buildscripts/mf-to-table.py: add .pfa, .pfb target
dependency.
* stepmake/stepmake/metafont-rules.make ($(outdir)/%.pfb): remove
.afm dependency
* buildscripts/mf-to-table.py (write_fontlist): use new markup syntax
---
ChangeLog | 5 +++++
buildscripts/mf-to-table.py | 7 +++++--
stepmake/stepmake/metafont-rules.make | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 70134a8afa..0aa6b31aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-03-05 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * buildscripts/mf-to-table.py: add .pfa, .pfb target dependency.
+
+ * stepmake/stepmake/metafont-rules.make ($(outdir)/%.pfb): remove
+ .afm dependency
+
* buildscripts/mf-to-table.py (write_fontlist): use new markup syntax
* python/lilylib.py (make_page_images): add function.
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 1fcdfbe558..d11bb5ce90 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -184,7 +184,10 @@ def write_fontlist (file, global_info, charmetrics):
""")
def write_deps (file, deps, targets):
+
+
for t in targets:
+ t = re.sub ( '^\\./', '', t)
file.write ('%s '% t)
file.write (": ")
for d in deps:
@@ -257,8 +260,8 @@ for filenm in files:
write_tex_defs (open (texfile_nm, 'w'), g, m)
write_ps_encoding (open (enc_nm, 'w'), g, m)
-
- write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', texfile_nm, afmfile_nm])
+
+ write_deps (open (depfile_nm, 'wb'), deps, [base + '.dvi', base + '.pfa', base + '.pfb', texfile_nm, afmfile_nm])
if lyfile_nm != '':
write_fontlist(open (lyfile_nm, 'w'), g, m)
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 94b7194915..e8eb5e6115 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -29,11 +29,11 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
gftopk $< $@
-$(outdir)/%.pfa: %.mf $(outdir)/%.afm
+$(outdir)/%.pfa: %.mf
$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F))
mv $(basename $(@F)).pfa $(outdir)
-$(outdir)/%.pfb: %.mf $(outdir)/%.afm
+$(outdir)/%.pfb: %.mf
$(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(basename $(@F))
-mv $(basename $(@F)).pfa $(outdir)
mv $(basename $(@F)).pfb $(outdir)
--
2.39.5