arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #237 from jelmer/rjs

Browse Source 
Add make variable for r.js, so it can easily be overriden.
This commit is contained in:
Martin Zimmermann 2016-02-26 13:15:44 +01:00
commit b5e7c78dcc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -25,6 +25,8 @@ DOCS_MAN_DST := man/man1/isso.1 man/man5/isso.conf.5
DOCS_HTML_DST := docs/_build/html DOCS_HTML_DST := docs/_build/html
RJS = r.js
all: man js site all: man js site
init: init:
@ -37,10 +39,10 @@ check:
-@python3 -m pyflakes $(ISSO_PY_SRC) -@python3 -m pyflakes $(ISSO_PY_SRC)
isso/js/%.min.js: $(ISSO_JS_SRC) $(ISSO_CSS) isso/js/%.min.js: $(ISSO_JS_SRC) $(ISSO_CSS)
r.js -o isso/js/build.$*.js out=$@ $(RJS) -o isso/js/build.$*.js out=$@
isso/js/%.dev.js: $(ISSO_JS_SRC) $(ISSO_CSS) isso/js/%.dev.js: $(ISSO_JS_SRC) $(ISSO_CSS)
r.js -o isso/js/build.$*.js optimize="none" out=$@ $(RJS) -o isso/js/build.$*.js optimize="none" out=$@
js: $(ISSO_JS_DST) js: $(ISSO_JS_DST)