* 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

diff --git a/ChangeLog b/ChangeLog
index 70134a8afa42822aa8039d0be7bd4fbc7ae6bad7..0aa6b31aaea1b57a7c951a525839dfae871531bb 100644 (file)
--- 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 1fcdfbe55893ecceb3477c17c0814d607bd1e5f6..d11bb5ce90cc30224a35257e0f109c803079f5b2 100644 (file)
--- 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 94b719491542a5b7cd8181eb52db167902902958..e8eb5e611594d8bc248cbbef9aafeb2ac6b9a40a 100644 (file)
--- 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)