From 8e5c328c2a8e5cfaa64d48b896191b17f30838dc Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Tue, 5 Oct 2021 15:31:40 -0400 Subject: Makefile: append FLAGS, reorder variables --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e813d30..85a3aa3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ MAKEFLAGS += -R -r -HTML_MINIFIER_FLAGS := \ +HTML_MINIFIER_FLAGS += \ --collapse-boolean-attributes \ --collapse-whitespace \ --decode-entities \ @@ -16,7 +16,7 @@ HTML_MINIFIER_FLAGS := \ --trim-custom-fragments WFS ?= ~/wfs/wfs.py -WFS_FLAGS := \ +WFS_FLAGS += \ --desubroutinize \ --layout-scripts=latn \ --layout-features-=frac,locl \ @@ -25,15 +25,15 @@ WFS_FLAGS := \ deployhosts := pink red blue +fonts := resume/EBGaramond-Italic.otf resume/EBGaramond-Regular.otf resume/EBGaramond-Medium.otf +fontssubset := $(fonts:.otf=.subset.woff2) + staticall := $(patsubst static/%,out/%,$(shell find static)) staticdirs := $(sort $(dir $(staticall))) staticfiles := $(filter-out $(staticdirs),$(staticall)) tocomp := $(filter %.txt %.html %.js %.css,$(staticfiles)) out/resume/index.html -fonts := resume/EBGaramond-Italic.otf resume/EBGaramond-Regular.otf resume/EBGaramond-Medium.otf -fontssubset := $(fonts:.otf=.subset.woff2) - all: $(staticall) out/resume $(tocomp:=.br) $(tocomp:=.gz) out/%: static/% -- cgit v1.2.3-70-g09d2