From 4ca248c6c836a89064e8282937fbde417983478f Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Mon, 21 Oct 2019 12:08:42 -0700 Subject: Makefile: Move misc/tools/fix-vf-meta.py to a better place --- Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7606e1cfb..b85ad7640 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,13 @@ build/%.woff: build/%.ttf # Master UFOs -> variable TTF -$(FONTDIR)/var/%.var.ttf: src/%.designspace $(all_ufo_masters) version.txt +$(FONTDIR)/var/Inter.var.ttf: src/Inter.designspace $(all_ufo_masters) version.txt misc/fontbuild compile-var -o $@ $(FONTBUILD_FLAGS) $< +$(FONTDIR)/var/Inter-%.var.ttf: src/Inter-%.designspace $(all_ufo_masters) version.txt + misc/fontbuild compile-var -o $@ $(FONTBUILD_FLAGS) $< + misc/tools/fix-vf-meta.py $@ + # Instance UFO -> OTF, TTF (note: masters' rules in generated.make) $(FONTDIR)/const/Inter-%.otf: build/ufo/Inter-%.ufo version.txt misc/fontbuild compile -o $@ $(FONTBUILD_FLAGS) $< @@ -102,7 +106,8 @@ $(FONTDIR)/const/Inter-%.ttf: build/ufo/Inter-%.ufo version.txt # designspace <- glyphs file -src/Inter-*.designspace: src/Inter.designspace +src/Inter-upright.designspace: src/Inter.designspace +src/Inter-italic.designspace: src/Inter.designspace src/Inter.designspace: src/Inter.glyphs misc/fontbuild glyphsync $< @@ -217,14 +222,6 @@ build/tmp/a.zip: cp -a misc/dist/*.txt "$(ZD)/" cp -a LICENSE.txt "$(ZD)/" @# - @# Fix VF metadata - misc/tools/fix-vf-meta.py \ - "$(ZD)/Inter (web)/Inter-upright.var.woff2" \ - "$(ZD)/Inter (web)/Inter-italic.var.woff2" - misc/tools/fix-vf-meta.py \ - "$(ZD)/Inter (TTF variable)/Inter-upright.var.ttf" \ - "$(ZD)/Inter (TTF variable)/Inter-italic.var.ttf" - @# @# Add "beta" to Light and Thin filenames. @# Requires "rename" tool in PATH (`brew install rename` on macOS) rename 's/(Light.*|Thin.*)\./$$1-BETA./' "$(ZD)/Inter"*/*.* -- cgit v1.2.3