summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Early <alexander.early@gmail.com>2015-05-19 19:45:39 -0700
committerAlexander Early <alexander.early@gmail.com>2015-05-19 19:45:39 -0700
commita73eef321256b36f529dce57a1e6ad7efd34851a (patch)
tree9e7aa5aea92b81e737f1bb964697bdca410e9d10
parentf49a63ffe8e0cbc9ba8b3da5f78d626a2188e66a (diff)
downloadasync-a73eef321256b36f529dce57a1e6ad7efd34851a.tar.gz
cleaning up build files
-rw-r--r--.gitignore4
-rw-r--r--Makefile13
-rw-r--r--package.json1
3 files changed, 8 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 8225baa..f06235c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/node_modules
-/dist
+node_modules
+dist
diff --git a/Makefile b/Makefile
index 4b0f23c..ac16a07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
PACKAGE = asyncjs
-NODEJS = $(if $(shell test -f /usr/bin/nodejs && echo "true"),nodejs,node)
-CWD := "$(shell pwd)"
-NODEUNIT = $(CWD)/node_modules/nodeunit/bin/nodeunit
-UGLIFY = $(CWD)/node_modules/uglify-js/bin/uglifyjs
-NODELINT = $(CWD)/node_modules/nodelint/nodelint
+CWD := $(shell pwd)
+NODEUNIT = "$(CWD)/node_modules/.bin/nodeunit"
+UGLIFY = "$(CWD)/node_modules/.bin/uglifyjs"
+JSHINT = "$(CWD)/node_modules/.bin/jshint"
BUILDDIR = dist
@@ -20,6 +19,6 @@ clean:
rm -rf $(BUILDDIR)
lint:
- $(NODELINT) --config nodelint.cfg lib/async.js
+ $(JSHINT) lib/*.js test/*.js
-.PHONY: test build all
+.PHONY: test lint build all clean
diff --git a/package.json b/package.json
index ffb6491..7385df8 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
"devDependencies": {
"jshint": "~2.7.0",
"lodash": ">=2.4.1",
- "nodelint": ">0.0.0",
"nodeunit": ">0.0.0",
"uglify-js": "1.2.x"
},