X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=1182b5aa4fa28926a6a31ac2d4b69b808f46889e;hb=63623c70e42052386e3a54b8109ea9ffdd8619b3;hp=b5e812d95b4a6a36fc7c470079a18daaef7e8076;hpb=5dca9626ec916bdfaf3a43360b2fe71ea44788a2;p=dygraphs.git

diff --git a/Makefile b/Makefile
index b5e812d..1182b5a 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 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