X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=e07bc1da15433902a6f68e4edd097cbc3c7ad00c;hb=2ed3480b3d067f380abf6636cb984ac9ff7cd484;hp=007468ed43511a82170b7533939a1ee23d0e80de;hpb=05cd81257489d0e1f1257e54c4e18d203998d4c6;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 007468e..e07bc1d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ all: test generate-combined generate-documentation
 clean:
 	@echo cleaning...
 	@cp .dygraph-combined-clean.js dygraph-combined.js
-	rm docs/options.html
+	rm -f docs/options.html
 
 generate-combined:
 	@echo Generating dygraph-combined.js
@@ -29,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