summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRasmus Andersson <rasmus@notion.se>2019-01-05 22:41:37 +0300
committerRasmus Andersson <rasmus@notion.se>2019-01-05 22:41:37 +0300
commitdee86b504c021bd465e124360a035d72e7abaa6d (patch)
tree87c6bf1b9495a31b8ba1758f840edbdac5e7e493 /Makefile
parentf15b156c4d2bfe939a070286514ba84d9fea95ea (diff)
downloadinter-dee86b504c021bd465e124360a035d72e7abaa6d.tar.xz
patches ufo2ft and drops python 2 env for OTF compilation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile58
1 files changed, 7 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index 695678998..23d6cc6f9 100644
--- a/Makefile
+++ b/Makefile
@@ -96,72 +96,28 @@ all_ufo_masters = $(Thin_ufo_d) \
$(FONTDIR)/var/%.var.ttf: src/%.designspace $(all_ufo_masters)
misc/fontbuild compile-var -o $@ $<
-
-# ---------- begin workaround for issue #110 -----------
-
-# $(FONTDIR)/const/Inter-UI-Thin.%: src/Inter-UI.designspace $(Thin_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-Thin.ufo
-
-# $(FONTDIR)/const/Inter-UI-ThinItalic.%: src/Inter-UI.designspace $(ThinItalic_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-ThinItalic.ufo
-
-# $(FONTDIR)/const/Inter-UI-Regular.%: src/Inter-UI.designspace $(Regular_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-Regular.ufo
-
-# $(FONTDIR)/const/Inter-UI-Italic.%: src/Inter-UI.designspace $(Italic_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-Italic.ufo
-
-# $(FONTDIR)/const/Inter-UI-Black.%: src/Inter-UI.designspace $(Black_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-Black.ufo
-
-# $(FONTDIR)/const/Inter-UI-BlackItalic.%: src/Inter-UI.designspace $(BlackItalic_ufo_d)
-# misc/fontbuild compile -o $@ src/Inter-UI-BlackItalic.ufo
-
-
-$(FONTDIR)/const/Inter-UI-Thin.ttf: src/Inter-UI.designspace $(Thin_ufo_d)
+$(FONTDIR)/const/Inter-UI-Thin.%: src/Inter-UI.designspace $(Thin_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-Thin.ufo
-$(FONTDIR)/const/Inter-UI-ThinItalic.ttf: src/Inter-UI.designspace $(ThinItalic_ufo_d)
+$(FONTDIR)/const/Inter-UI-ThinItalic.%: src/Inter-UI.designspace $(ThinItalic_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-ThinItalic.ufo
-$(FONTDIR)/const/Inter-UI-Regular.ttf: src/Inter-UI.designspace $(Regular_ufo_d)
+$(FONTDIR)/const/Inter-UI-Regular.%: src/Inter-UI.designspace $(Regular_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-Regular.ufo
-$(FONTDIR)/const/Inter-UI-Italic.ttf: src/Inter-UI.designspace $(Italic_ufo_d)
+$(FONTDIR)/const/Inter-UI-Italic.%: src/Inter-UI.designspace $(Italic_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-Italic.ufo
-$(FONTDIR)/const/Inter-UI-Black.ttf: src/Inter-UI.designspace $(Black_ufo_d)
+$(FONTDIR)/const/Inter-UI-Black.%: src/Inter-UI.designspace $(Black_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-Black.ufo
-$(FONTDIR)/const/Inter-UI-BlackItalic.ttf: src/Inter-UI.designspace $(BlackItalic_ufo_d)
+$(FONTDIR)/const/Inter-UI-BlackItalic.%: src/Inter-UI.designspace $(BlackItalic_ufo_d)
misc/fontbuild compile -o $@ src/Inter-UI-BlackItalic.ufo
-$(FONTDIR)/const/Inter-UI-Thin.otf: src/Inter-UI.designspace $(Thin_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-Thin.ufo
-
-$(FONTDIR)/const/Inter-UI-ThinItalic.otf: src/Inter-UI.designspace $(ThinItalic_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-ThinItalic.ufo
-
-$(FONTDIR)/const/Inter-UI-Regular.otf: src/Inter-UI.designspace $(Regular_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-Regular.ufo
-
-$(FONTDIR)/const/Inter-UI-Italic.otf: src/Inter-UI.designspace $(Italic_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-Italic.ufo
-
-$(FONTDIR)/const/Inter-UI-Black.otf: src/Inter-UI.designspace $(Black_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-Black.ufo
-
-$(FONTDIR)/const/Inter-UI-BlackItalic.otf: src/Inter-UI.designspace $(BlackItalic_ufo_d)
- misc/fontbuild2 compile -o $@ src/Inter-UI-BlackItalic.ufo
-
-# ---------- end workaround for issue #110 -----------
-
-
# Instance UFO -> OTF, TTF
-
$(FONTDIR)/const/Inter-UI-%.otf: build/ufo/Inter-UI-%.ufo
- misc/fontbuild2 compile -o $@ $<
+ misc/fontbuild compile -o $@ $<
$(FONTDIR)/const/Inter-UI-%.ttf: build/ufo/Inter-UI-%.ufo
misc/fontbuild compile -o $@ $<