Merge pull request #184 from kberg/master

[dygraphs.git] / Makefile

diff --git a/Makefile b/Makefile
index 2614ea3..b5e812d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,10 @@
 #
 # Dean Wampler <dean@deanwampler.com> March 22, 2010
 
-all: generate-combined
+all: test generate-combined
+
+clean:
+       @cp .dygraph-combined-clean.js dygraph-combined.js
 
 generate-combined:
        @echo Generating dygraph-combined.js
@@ -15,3 +18,9 @@ gwt: generate-gwt
 generate-gwt:
        @echo Generating GWT JAR file
        @./generate-jar.sh
+
+test:
+       @./test.sh
+
+lint:
+       @./lint.sh