summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-04-16 15:17:31 -0400
committerAlex Xu <alex_y_xu@yahoo.ca>2014-04-16 15:17:31 -0400
commite417662dce5cae2e95ef98ee38baa8f53a02b9d5 (patch)
treedce94fb8524dece7e3fcc677ec0cf908a6ec2a97 /Makefile
parent6a50d79523cf215001cdd55c74c040bd410775df (diff)
downloadhtml5ks-e417662dce5cae2e95ef98ee38baa8f53a02b9d5.tar.xz
html5ks-e417662dce5cae2e95ef98ee38baa8f53a02b9d5.zip
mbleh
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile37
1 files changed, 21 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index c606599..58f9960 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,16 @@ www/js/lib/when.js: when
IRPYC := ast2json/imachine.rpyc ast2json/imachine_replay.rpyc
IJSON := $(IRPYC:ast2json/%.rpyc=www/json/%.json)
-URPYC := ast2json/ui-strings.rpyc ast2json/ui-strings_FR.rpyc
-UJSON := $(URPYC:ast2json/%.rpyc=www/json/%.json)
+TRPYC := ast2json/ui-strings.rpyc ast2json/ui-strings_FR.rpyc
+TJSON := $(TRPYC:ast2json/%.rpyc=www/json/%.json)
+
+ERPYC := ast2json/ui_settings.rpyc
+EJSON := $(ERPYC:ast2json/%.rpyc=www/json/%.json)
SRPYC := $(wildcard ast2json/script-a*.rpyc)
-JSONI := $(SRPYC:%.rpyc=%.json.i)
SJSON := $(SRPYC:ast2json/%.rpyc=www/json/%.json)
-JSON := $(IJSON) $(UJSON) $(SJSON)
+JSON := $(IJSON) $(TJSON) $(EJSON) $(SJSON)
JSONGZ := $(JSON:=.gz)
AJSON := $(JSON) $(JSONGZ)
@@ -69,21 +71,24 @@ json: $(AJSON)
$(SJSON): www/json/%.json: ast2json/script2json.py ast2json/%.json.i
$^ $@
-$(UJSON): www/json/%.json: ast2json/strings2json.py ast2json/%.json.i
+$(TJSON): www/json/%.json: ast2json/strings2json.py ast2json/%.json.i
$^ $@
$(IJSON): www/json/%.json: ast2json/imachine2json.py ast2json/%.json.i
$^ $@
+$(EJSON): www/json/%.json: ast2json/settings2json.py ast2json/%.json.i
+ $^ $@
+
%.json.gz: %.json
-ifdef GZIP
-ifdef DEFLUFF
- $(GZIP) -c $< | $(DEFLUFF) > $@
-else
- $(GZIP) -c $< > $@
-endif
- touch $< $@
-endif
+ $(if $(GZIP),
+ $(if $(DEFLUFF),
+ $(GZIP) -c $< | $(DEFLUFF) > $@
+ ,
+ $(GZIP) -c $< > $@
+ )
+ touch $< $@
+ )
# === VIDEO ===
@@ -189,7 +194,7 @@ www/dump/ui/ctc_anim.webp: $(CTC_ANIM_TMP_WEBP)
# === MISC ===
-test: $(MYJS)
+test: $(MYJS) $(AJSON)
jshint --show-non-errors $^
space:
@@ -209,5 +214,5 @@ MAKEFLAGS=-LRr
.SUFFIXES:
.PRECIOUS: $(WAV)
-.INTERMEDIATE: $(WAV) $(JSONO) $(Y4M) $(CTC_ANIM_TMP_ALL) $(CTC_ANIM_TMP_WEBP)
-.PHONY: video audio images js jshint space watch
+.INTERMEDIATE: $(WAV) $(Y4M) $(CTC_ANIM_TMP_ALL) $(CTC_ANIM_TMP_WEBP)
+.PHONY: video audio images js test space watch