X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/60c22258763ec046ef91af80e2abcb57b0c29033..795859dd991bf96637a5cdf3e46714e618c43881:/Makefile

diff --git a/Makefile b/Makefile
index 8ff1638..994c705 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,22 @@
-all: sitemap.xml data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl
-more: all data/digraphs-xorg.inc.pl
+all: sitemap.xml light.css data/digraphs.inc.pl data/unicode-cover.inc.pl data/countries.inc.pl data/browser data/termcol-xcolor.inc.pl data/digraphs-xorg.inc.pl
+more: all
 
 download: data/DerivedAge.txt data/rfc1345.txt data/xorg-compose data/countryInfo.txt data/browser/caniuse data/browser/usage-wm.tsv data/xcolors data/unicode-sampler
 .PHONY: download
 
 # atomically create file by command
-cmdsave = @echo $1 $2 \>$@; $1 $2 | sponge $@
+cmdsave = @echo '$1' $2 \>$@; mispipe '$1 $2' 'ifne sponge $@'
 # download git checkout
-gitsave = @echo git pull or clone $@; \
-	[ -r $@/.git ] && cd $@ && git pull --ff-only || true; \
-	[ -e $@ ] || git clone "$1" $@
+gitsave = @if cd $@ 2>/dev/null; \
+	then echo git pull $@; git pull -q --ff-only || true; \
+	else echo git clone $1 $@; git clone -q --progress $1 $@; fi
 
 sitemap.xml: tools/mksitemap
 	$(call cmdsave,$<)
 
+light.css: tools/stripcss base.css
+	$(call cmdsave,$^)
+
 data/DerivedAge.txt:
 	tools/wget-ifmodified http://www.unicode.org/Public/UNIDATA/$(@F) $@
 
@@ -57,7 +60,7 @@ data/xcolors:
 data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
 	$(call cmdsave,$^/*)
 
-.SECONDARY:
+.SECONDARY: data/font/%.ttf
 data/font/%.ttf:
 	find /usr/share/fonts/truetype/ ~/.fonts/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
 data/font/%.win2k.ttf:
@@ -101,11 +104,12 @@ data/countries.inc.pl: tools/mkcountries-geonames data/countryInfo.txt
 
 data/browser: data/browser/support.inc.pl data/browser/usage-wm.inc.pl
 
+data/browser/caniuse/fulldata-json/data-2.0.json: data/browser/caniuse
 data/browser/caniuse/data.json: data/browser/caniuse
 data/browser/caniuse:
 	$(call gitsave,https://github.com/Fyrd/caniuse.git)
 
-data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/data.json
+data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/fulldata-json/data-2.0.json
 	$(call cmdsave,$^)
 
 data/browser/usage-wm.tsv: