Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-04-13 22:16:39 -07:00
commit a9fd077c11
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,6 +1,6 @@
name := 4chan-X name := 4chan-X
ifeq "$(OS)" "Windows_NT" ifdef ComSpec
BIN := $(subst /,\,node_modules/.bin/) BIN := $(subst /,\,node_modules/.bin/)
RMDIR := -rmdir /s /q RMDIR := -rmdir /s /q
RM := -del RM := -del
@ -87,8 +87,7 @@ imports_bottom := \
tmp/style.css tmp/style.css
imports_font_awesome := \ imports_font_awesome := \
node_modules/font-awesome/css/font-awesome.css \ node_modules/font-awesome/package.json
node_modules/font-awesome/fonts/fontawesome-webfont.woff
imports_style := \ imports_style := \
$(wildcard src/Linkification/icons/*.png) $(wildcard src/Linkification/icons/*.png)
@ -115,11 +114,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/% : .events/npm node_modules/%/package.json : .events/npm.%
.tests_enabled : .tests_enabled :