From 2d972a5f1dec927ef2945822e3403f77c540e4e6 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 4 Mar 2014 17:17:06 -0500
Subject: meh

---
 Makefile   |  8 ++++++--
 README.rst | 16 ++++++++--------
 2 files changed, 14 insertions(+), 10 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
diff --git a/README.rst b/README.rst
index adaa383..d73258a 100644
--- a/README.rst
+++ b/README.rst
@@ -20,24 +20,23 @@ Requirements
 - Firefox/Chrome/a sensible browser (i.e. not IE)
 - a shell (Bash, dash, zsh, etc)
 - GNU make
-- ffmpeg with fdk-aac, libopus, libtheora, libvpx, libx264 (preferably git HEAD)
+- ffmpeg with fdk-aac, libopus, libtheora, libvpx-vp9, libx264 (preferably git HEAD)
 - cwebp and webpmux from libwebp
 - convert from ImageMagick
 - apngasm
 - Node.js, npm
-- uglifyjs installed globally
 
 Recommended
 '''''''''''
-- jpegmini
-- jpegtran
-- jpegrescan
-- pngquant
 - DeflOpt
 - defluff
+- inotify-tools (for ``make watch``)
+- jpegmini
+- jpegrescan
+- jpegtran
 - nginx
+- pngquant
 - zopfli
-- inotify-tools (for ``make watch``)
 
 Build steps
 -----------
@@ -57,7 +56,8 @@ Disabling unused conversions
 To reduce programs and build time required, some conversions can be disabled.
 Defining MINIMAL as an environment variable will disable the safe ones.
 
-Alternatively, specific conversions can be disabled by setting the appropriate program variable to ":". See the Makefile for more information.
+Alternatively, specific conversions can be disabled by passing ``PROGRAM=`` on the command line, i.e. leaving it undefined.
+See the Makefile for more information.
 
 Reducing disk usage
 -------------------
-- 
cgit v1.2.3-70-g09d2