simplify makefile, update node versions for travis

caolan · Oct 25, 2015 · f88e57c · f88e57c
1 parent e04b644
commit f88e57c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: node_js
 node_js:
   - "0.10"
   - "0.12"
-  - "iojs-v2.1.0"
   - "4"
 sudo: false
 after_success: npm run coveralls

diff --git a/Makefile b/Makefile
@@ -1,9 +1,6 @@
+export PATH := ./node_modules/.bin/:$(PATH):./bin/
+
 PACKAGE = asyncjs
-CWD := $(shell pwd)
-NODEUNIT = "$(CWD)/node_modules/.bin/nodeunit"
-UGLIFY = "$(CWD)/node_modules/.bin/uglifyjs"
-JSHINT = "$(CWD)/node_modules/.bin/jshint"
-JSCS = "$(CWD)/node_modules/.bin/jscs"
 XYZ = node_modules/.bin/xyz --repo git@github.com:caolan/async.git
 
 BUILDDIR = dist
@@ -14,17 +11,17 @@ all: lint test clean build
 build: $(wildcard  lib/*.js)
 	mkdir -p $(BUILDDIR)
 	cp $(SRC) $(BUILDDIR)/async.js
-	cd $(BUILDDIR) && $(UGLIFY) async.js -mc --source-map async.min.map -o async.min.js
+	cd $(BUILDDIR) && uglifyjs async.js -mc --source-map async.min.map -o async.min.js
 
 test:
-	$(NODEUNIT) test
+	nodeunit test
 
 clean:
 	rm -rf $(BUILDDIR)
 
 lint:
-	$(JSHINT) $(SRC) test/*.js mocha_test/* perf/*.js
-	$(JSCS) $(SRC) test/*.js mocha_test/* perf/*.js
+	jshint $(SRC) test/*.js mocha_test/* perf/*.js
+	jscs $(SRC) test/*.js mocha_test/* perf/*.js
 
 .PHONY: test lint build all clean