'make server' should not always run yuidoc

Makefile

-FILES=$(shell bzr ls -RV -k file | grep -v assets/ | grep -v app/templates.js |   grep -v server.js)
+JSFILES=$(shell bzr ls -RV -k file | grep -E -e '.+\.js(on)?$$|generateTemplates  $$' | grep -Ev -e '^manifest\.json$$' -e '^test/assets/' -e '^app/assets/javascr  ipts/reconnecting-websocket.js$$' -e '^server.js$$')

[benji, 2012/10/31 12:43:02]

Do we want to include any assets? It seems to me that we want to exclude '/assets/' in all its forms. 

+
 # After a successful "make" run, the NODE_TARGETS list can be regenerated with
 # this command (and then manually pasted in here):
 # find node_modules -maxdepth 1 -mindepth 1 -type d -printf 'node_modules/%f '
 NODE_TARGETS=node_modules/minimatch node_modules/cryptojs \
 node_modules/yuidocjs node_modules/chai node_modules/less \
 node_modules/.bin node_modules/node-markdown node_modules/rimraf \
 node_modules/mocha node_modules/d3 node_modules/graceful-fs \
 node_modules/should node_modules/jshint node_modules/expect.js \
 node_modules/express node_modules/yui node_modules/yuidoc \
 node_modules/grunt node_modules/node-spritesheet
 TEMPLATE_TARGETS=$(shell bzr ls -k file app/templates)
 SPRITE_SOURCE_FILES=$(shell bzr ls -R -k file app/assets/images)
 SPRITE_GENERATED_FILES=app/assets/sprite/sprite.css app/assets/sprite/sprite.png
 DATE=$(shell date -u)
 APPCACHE=app/assets/manifest.appcache
 
 all: install
 
 app/templates.js: $(TEMPLATE_TARGETS) bin/generateTemplates
 @./bin/generateTemplates
 
-yuidoc: install $(FILES)
+yuidoc/index.html: node_modules/yuidocjs $(JSFILES)
 @node_modules/.bin/yuidoc -o yuidoc -x assets app
 
+yuidoc: yuidoc/index.html
+
 $(SPRITE_GENERATED_FILES): node_modules/grunt node_modules/node-spritesheet $(SP RITE_SOURCE_FILES)
 @node_modules/grunt/bin/grunt spritegen
-  mv bin/sprite app/assets/sprite/
+  @mv bin/sprite app/assets/sprite/
 
 $(NODE_TARGETS): package.json
 @npm install
 @#link depends
 @ln -sf `pwd`/node_modules/yui ./app/assets/javascripts/
 @ln -sf `pwd`/node_modules/d3/d3.v2* ./app/assets/javascripts/
 
 install: appcache $(NODE_TARGETS) app/templates.js yuidoc spritegen
 
 gjslint: virtualenv/bin/gjslint
 @virtualenv/bin/gjslint --strict --nojsdoc --jslint_error=all \
 --custom_jsdoc_tags module,main,class,method,event,property,attribut e,submodule,namespace,extends,config,constructor,static,final,readOnly,writeOnce ,optional,required,param,return,for,type,private,protected,requires,default,uses ,example,chainable,deprecated,since,async,beta,bubbles,extension,extensionfor,ex tension_for \
-  $(FILES)
+  $(JSFILES)
 
 jshint: node_modules/jshint
-  @node_modules/jshint/bin/hint $(FILES)
+  @node_modules/jshint/bin/hint $(JSFILES)
 
-yuidoc-lint: $(FILES)
+yuidoc-lint: $(JSFILES)
 @bin/lint-yuidoc
 
 lint: gjslint jshint yuidoc-lint
 
 virtualenv/bin/gjslint virtualenv/bin/fixjsstyle:
 @virtualenv virtualenv
 @virtualenv/bin/easy_install archives/closure_linter-latest.tar.gz
 
 beautify: virtualenv/bin/fixjsstyle
-  @virtualenv/bin/fixjsstyle --strict --nojsdoc --jslint_error=all $(FILES  )
+  @virtualenv/bin/fixjsstyle --strict --nojsdoc --jslint_error=all $(JSFIL  ES)
 
 spritegen: $(SPRITE_GENERATED_FILES)
 
 prep: beautify lint
 
 test: install
 @./test-server.sh
 
 server: install
 @echo "Customize config.js to modify server settings"
@@ skipping 13 matching lines @@
 
 # A target used only for forcibly updating the appcache.
 appcache-touch:
 @touch manifest.appcache.in
 
 # This is the real target. appcache-touch needs to be executed before
 # appcache, and this provides the correct order.
 appcache-force: appcache-touch appcache
 
 .PHONY: test lint beautify server install clean prep jshint gjslint \
-  appcache appcache-touch appcache-force spritegen yuidoc-lint
+  appcache appcache-touch appcache-force yuidoc spritegen yuidoc-lint