Merge pull request #185 from davidmsibley/master

[dygraphs.git] / Makefile

diff --git a/Makefile b/Makefile
index b71596c..b5e812d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,23 @@
 #
 # 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
-       @generate-combined.sh
+       @./generate-combined.sh
+
+gwt: generate-gwt
+
+generate-gwt:
+       @echo Generating GWT JAR file
+       @./generate-jar.sh
+
+test:
+       @./test.sh
+
+lint:
+       @./lint.sh