X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=2ab31deab0d7ec9f9f40962692486d0dd1eaa47a;hb=b1e9e2e03dbccf94fff08ab37dc6e8c64c75736d;hp=2047c7fa1c0112044788c417ecc3beb7dd77b30a;hpb=6c1133d2f784721938f786967ed30229f09f951b;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 2047c7f..2ab31de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,4 @@
-# Run the generate-combined.sh script.
-# This Makefile isn't really necessary, but it serves as a "indicator"
-# to new users that they need to do a "build" of sorts.
-#
-# Dean Wampler <dean@deanwampler.com> March 22, 2010
+# You should run "npm install" before running any commands in this Makefile.
 
 all: test generate-combined generate-documentation
 
@@ -38,9 +34,15 @@ move-combined: generate-combined
 clean-combined-test: clean
 	@echo restoring combined
 	git checkout dygraph-dev.js
+	rm dygraph-combined.js.map
 
 lint:
-	@./lint.sh
+	@./generate-combined.sh ls \
+	    | grep -v 'polyfills' \
+	    | xargs ./node_modules/.bin/jshint
+
+# Commands to run for continuous integration on Travis-CI
+travis: test test-combined lint
 
 publish:
 	./generate-combined.sh