Merge pull request #179 from kberg/makefile-fun

Some Makefile fun - * new lint and clean commands, * add test to generate-combined

diff --git a/.dygraph-combined-clean.js b/.dygraph-combined-clean.js
new file mode 100644 (file)
index 0000000..e6380de
--- /dev/null
+++ b/.dygraph-combined-clean.js
@@ -0,0 +1,7 @@
+This is not the file you are looking for.
+A reasonably up-to-date version can be found at http://dygraphs.com/dygraph-combined.js
+
+dygraph-combined.js is a "packed" version of the larger dygraphs JS files. It is
+smaller and loads more quickly, but is harder to debug.
+
+To generate this file, run "make" or generate-combined.sh.

diff --git a/Makefile b/Makefile
index 6a645a5..b5e812d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,10 @@
 #
 # 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
@@ -18,3 +21,6 @@ generate-gwt:
 
 test:
        @./test.sh
+
+lint:
+       @./lint.sh