Merge branch 'bstable'

This commit is contained in:
ccd0 2016-04-14 16:17:24 -07:00
commit f5c76e6528

View File

@ -87,7 +87,8 @@ imports_bottom := \
tmp/style.css tmp/style.css
imports_font_awesome := \ imports_font_awesome := \
node_modules/font-awesome/package.json node_modules/font-awesome/css/font-awesome.css \
node_modules/font-awesome/fonts/fontawesome-webfont.woff
imports_style := \ imports_style := \
$(wildcard src/Linkification/icons/*.png) $(wildcard src/Linkification/icons/*.png)
@ -114,11 +115,11 @@ all : bds jshint install
.events tmp testbuilds builds : .events tmp testbuilds builds :
$(MKDIR) $(MKDIR)
.events/npm.% : npm-shrinkwrap.json | .events .events/npm : npm-shrinkwrap.json | .events
npm install $* npm install
echo -> $@ echo -> $@
node_modules/%/package.json : .events/npm.% node_modules/% : .events/npm
.tests_enabled : .tests_enabled :