X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=e07bc1da15433902a6f68e4edd097cbc3c7ad00c;hb=794e4d006192940a44e2678cb570392017dc9361;hp=6a645a532b20ffbd4149fca272f181a43868550f;hpb=86a3e64f8f73d854b3b4ac35f52b54bfda3056a4;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 6a645a5..e07bc1d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,22 @@
 #
 # Dean Wampler <dean@deanwampler.com> March 22, 2010
 
-all: generate-combined
+all: test generate-combined generate-documentation
+
+clean:
+	@echo cleaning...
+	@cp .dygraph-combined-clean.js dygraph-combined.js
+	rm -f docs/options.html
 
 generate-combined:
 	@echo Generating dygraph-combined.js
 	@./generate-combined.sh
 
+generate-documentation:
+	@echo Generating docs/options.html
+	@./generate-documentation.py > docs/options.html
+	@chmod a+r docs/options.html
+
 gwt: generate-gwt
 
 generate-gwt:
@@ -18,3 +28,15 @@ generate-gwt:
 
 test:
 	@./test.sh
+
+test-combined: move-combined test clean-combined-test
+
+move-combined: generate-combined
+	mv dygraph-combined.js dygraph-dev.js
+
+clean-combined-test: clean
+	@echo restoring combined
+	git checkout dygraph-dev.js
+
+lint:
+	@./lint.sh