From d4fab578c9ee5a384082cad1da078925cfbadba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= <linus@folkdatorn.se>
Date: Wed, 14 Oct 2015 08:41:33 +0200
Subject: [PATCH] drop make

---
 .travis.yml  |  2 +-
 Makefile     | 19 -------------------
 package.json |  7 ++++++-
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 Makefile

diff --git a/.travis.yml b/.travis.yml
index dd7671f..44e14cf 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7861321..0000000
--- a/Makefile
+++ /dev/null
@@ -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
diff --git a/package.json b/package.json
index 98f1a8e..0fe67c1 100644
--- a/package.json
+++ b/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"