Have make clean not delete builds/; introduce make cleanall for that.

This commit is contained in:
ccd0 2016-04-11 15:25:43 -07:00
parent 3203faa688
commit b72fcad4c7
2 changed files with 12 additions and 10 deletions

View File

@ -24,7 +24,7 @@ module.exports = (grunt) ->
command: 'make -j' command: 'make -j'
full: full:
command: """ command: """
make clean make cleanall
make -j all make -j all
""".split('\n').join('&&') """.split('\n').join('&&')
clean: clean:

View File

@ -2,8 +2,12 @@ name := 4chan-X
ifeq "$(OS)" "Windows_NT" ifeq "$(OS)" "Windows_NT"
BIN := $(subst /,\,node_modules/.bin/) BIN := $(subst /,\,node_modules/.bin/)
RMDIR := -rmdir /s /q
RM := -del
else else
BIN := node_modules/.bin/ BIN := node_modules/.bin/
RMDIR := rm -rf
RM := rm -rf
endif endif
coffee := $(BIN)coffee -c --no-header coffee := $(BIN)coffee -c --no-header
@ -179,16 +183,14 @@ install.json :
.SECONDARY : .SECONDARY :
.PHONY: default all clean testbuilds builds jshint install .PHONY: default all clean cleanall testbuilds builds jshint install
ifeq "$(OS)" "Windows_NT" clean :
clean : $(RMDIR) tmp testbuilds .events
-rmdir /s /q tmp testbuilds builds .events $(RM) .jshintrc .tests_enabled
-del .jshintrc .tests_enabled
else cleanall : clean
clean : $(RMDIR) builds
rm -rf tmp testbuilds builds .events .jshintrc .tests_enabled
endif
testbuilds : $(testbuilds) testbuilds : $(testbuilds)