summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-03-05 19:00:25 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-03-05 19:00:25 -0500
commit5b2a9a221ed74fbf10f229f665d05af3a12184c9 (patch)
treea35702dc04b3f5a7ea080375753acc188e113d21 /Makefile
parentd0d86adcdb3a00fc44b68627b0b571de5e454a1f (diff)
downloadhtml5ks-5b2a9a221ed74fbf10f229f665d05af3a12184c9.tar.xz
html5ks-5b2a9a221ed74fbf10f229f665d05af3a12184c9.zip
duh
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5d6f5e1..b5f6edc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CWEBP += -quiet -alpha_cleanup -m 6
WEBPMUX ?= webpmux
CONVERT ?= convert
APNGASM ?= apngasm
-NPM ?= npm
+NPM ?= npm --quiet
JS_COMPRESSOR ?= uglifyjs
LOCAL_UGLIFYJS := node_modules/.bin/uglifyjs
UGLIFYJS ?= $(LOCAL_UGLIFYJS)
@@ -16,7 +16,7 @@ PACKR ?= packr
CLOSURE_COMPILER ?= java -jar compiler.jar
ifndef MINIMAL
ZOPFLIPNG ?= zopflipng
-DEFLOPT ?= wine DeflOpt
+#DEFLOPT ?= wine DeflOpt
DEFLUFF ?= defluff
PNGQUANT ?= pngquant
endif
@@ -196,5 +196,6 @@ watch:
MAKEFLAGS=-r
.SUFFIXES:
+.SECONDARY: $(WAV)
.INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
.PHONY: video audio images js jshint clean space watch