summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-03-04 17:17:06 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-03-04 17:17:06 -0500
commit2d972a5f1dec927ef2945822e3403f77c540e4e6 (patch)
treee034ebce28972b28748aec17927a0b822d6140f5 /Makefile
parent3fd99058301e1c50ab60f77347e3e6477ed4eaf2 (diff)
downloadhtml5ks-2d972a5f1dec927ef2945822e3403f77c540e4e6.tar.xz
html5ks-2d972a5f1dec927ef2945822e3403f77c540e4e6.zip
meh
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ab02026..855d44d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ WEBPMUX ?= webpmux
CONVERT ?= convert
APNGASM ?= apngasm
NPM ?= npm
-UGLIFYJS := node_modules/.bin/uglifyjs
+DUGLIFYJS := node_modules/uglify-js/bin/uglifyjs
+UGLIFYJS ?= $(DUGLIFYJS)
ifndef MINIMAL
ZOPFLIPNG ?= zopflipng
DEFLOPT ?= wine DeflOpt
@@ -177,8 +178,10 @@ else
endif
endif
+ifeq ($(DUGLIFYJS), $(UGLIFYJS))
$(UGLIFYJS): package.json
$(NPM) update
+endif
# === MISC ===
@@ -195,8 +198,9 @@ watch:
$(MAKE); \
done
-# disable default rules, increases `make` speed by 3 seconds
+# disable implicit rules, increases `make` speed by 3 seconds
MAKEFLAGS=-r
+.SUFFIXES:
.INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
.PHONY: video audio images js jshint clean space watch