projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/danvk/dygraphs into i382
[dygraphs.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
007468e
..
e07bc1d
100644
(file)
--- 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
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
generate-combined:
@echo Generating dygraph-combined.js
@@
-29,5
+29,14
@@
generate-gwt:
test:
@./test.sh
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
lint:
@./lint.sh