Merge pull request #643 from LinusU/drop-make

drop make

.travis.yml

@@ -21,4 +21,4 @@ before_install:
   - sh install
   - npm explore npm -g -- npm install node-gyp@latest
 after_script:
-  - make benchmark
+  - npm run benchmark

Makefile

@@ -1,19 +0,0 @@
-
-ADDON = build/Release/canvas.node
-
-$(ADDON): src/*.cc
-	npm install
-
-test: $(ADDON)
-	@./node_modules/.bin/mocha test/*.test.js
-
-test-server: $(ADDON)
-	@node test/server.js
-
-benchmark:
-	@node benchmarks/run.js
-
-clean:
-	rm -fr build
-
-.PHONY: test test-server benchmark clean

package.json

@@ -21,7 +21,12 @@
   "homepage": "https://github.com/Automattic/node-canvas",
   "repository": "git://github.com/Automattic/node-canvas.git",
   "scripts": {
-    "test": "make test"
+    "prebenchmark": "node-gyp build",
+    "benchmark": "node benchmarks/run.js",
+    "pretest": "node-gyp build",
+    "test": "mocha test/*.test.js",
+    "pretest-server": "node-gyp build",
+    "test-server": "node test/server.js"
   },
   "dependencies": {
     "nan": "^2.0.9"