From b9b015dffedd096e8bbeec2b200b711a8a87acc1 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Wed, 19 Feb 2014 09:19:32 -0500
Subject: asdf

---
 .travis.sh |  2 +-
 Makefile   | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 9c145f8..427afdc 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -19,7 +19,7 @@ case "$1" in
   install)
     sudo apt-get install -q libjpeg-progs libtheora-dev libvpx-dev libx264-dev npm webp yasm
 
-    sudo npm install -g grunt-cli uglifyjs
+    sudo npm install -g uglifyjs
 
     cd fdk-aac-0.1.3
     ./configure --disable-shared
diff --git a/Makefile b/Makefile
index ee7409d..e5167cd 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CWEBP += -short -alpha_cleanup
 WEBPMUX ?= webpmux
 CONVERT ?= convert
 APNGASM ?= apngasm
-UGLIFYJS ?= node_modules/.bin/uglifyjs
+UGLIFYJS ?= uglifyjs
 ifdef MINIMAL
 ZOPFLIPNG ?= zopflipng
 DEFLOPT ?= wine DeflOpt
@@ -22,12 +22,7 @@ endif
 
 DUMP ?= www/dump
 
-all: modules video audio images js
-
-# === GIT SUBMODULES ===
-Modernizr/dist/modernizr-build.js: config-all.json
-	ln -fs ../../config-all.json Modernizr/lib/config-all.json
-	cd Modernizr && npm update && node_modules/.bin/grunt build
+all: video audio images js
 
 # === VIDEO ===
 
@@ -136,9 +131,13 @@ JSDATA := www/js/play.js www/js/images.js
 JS := $(JSLIBS) $(MYJS) $(JSDATA)
 JSOUT := www/js/all.min.js
 
+Modernizr/dist/modernizr-build.js: config-all.json
+	ln -fs ../../config-all.json Modernizr/lib/config-all.json
+	cd Modernizr && npm update && node_modules/.bin/grunt build
+
 js: $(JSOUT)
 
-$(JSOUT): $(JS) modules
+$(JSOUT): $(JS)
 	$(UGLIFYJS) $(JS) -o "$@" --source-map "$@".map --source-map-url ./all.min.js.map -p 2 -m -c drop_debugger=false
 
 # === MISC ===
@@ -163,4 +162,4 @@ watch:
 .SUFFIXES:
 
 .INTERMEDIATE: $(Y4M) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
-.PHONY: modules video audio images js jshint clean space watch
+.PHONY: video audio images js jshint clean space watch
-- 
cgit v1.2.3-70-g09d2