summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Andersson <rasmus@notion.se>2017-11-27 07:26:15 +0300
committerRasmus Andersson <rasmus@notion.se>2017-11-27 07:26:15 +0300
commita8ae2ca2302e6b1ff2592cbc6f306e90940ac0d3 (patch)
tree254e1f06d01cf6bcd4a99ffcbc07069b7e7cf937
parent51aed9fbfeabf37948d6e693e851a58c0458c59d (diff)
downloadinter-a8ae2ca2302e6b1ff2592cbc6f306e90940ac0d3.tar.xz
makefile: fix bug with web fonts dependency being run in the wrong order when running make with many parallel jobs
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index eddf4955c..a9a43404e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,11 @@
# install Build all (web, ttf and otf) and install. Mac-only for now.
# dist Create a new release distribution. Does everything.
#
-all: all_web all_otf
-all_hinted: all_web_hinted
+all: all_ttf all_otf
+ $(MAKE) all_web -j
+
+all_hinted: all_ttf all_ttf_hinted all_otf
+ $(MAKE) all_web_hinted -j
VERSION := $(shell misc/version.py)
@@ -127,18 +130,21 @@ copy_docs_fonts:
cp -a build/dist-unhinted/*.woff build/dist-unhinted/*.woff2 build/dist-unhinted/*.otf docs/font-files/
install_ttf: all_ttf_unhinted
+ $(MAKE) all_web -j
@echo "Installing TTF files locally at ~/Library/Fonts/Inter UI"
rm -rf ~/'Library/Fonts/Inter UI'
mkdir -p ~/'Library/Fonts/Inter UI'
cp -va build/dist-unhinted/*.ttf ~/'Library/Fonts/Inter UI'
install_ttf_hinted: all_ttf
+ $(MAKE) all_web -j
@echo "Installing autohinted TTF files locally at ~/Library/Fonts/Inter UI"
rm -rf ~/'Library/Fonts/Inter UI'
mkdir -p ~/'Library/Fonts/Inter UI'
cp -va build/dist-hinted/*.ttf ~/'Library/Fonts/Inter UI'
-install_otf: all_otf all_web
+install_otf: all_otf
+ $(MAKE) all_web -j
@echo "Installing OTF files locally at ~/Library/Fonts/Inter UI"
rm -rf ~/'Library/Fonts/Inter UI'
mkdir -p ~/'Library/Fonts/Inter UI'