X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=e07bc1da15433902a6f68e4edd097cbc3c7ad00c;hb=e43d4d238ae016b477aee3f60f1707fb4effacd3;hp=b5e812d95b4a6a36fc7c470079a18daaef7e8076;hpb=c0db98cad530f19052d6fa470bfe32d594607604;p=dygraphs.git

diff --git a/Makefile b/Makefile
index b5e812d..e07bc1d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,22 @@
 #
 # Dean Wampler <dean@deanwampler.com> March 22, 2010
 
-all: test 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:
@@ -22,5 +29,14 @@ 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