X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=f1f19bbb407c006e9059e79279a2e951e4cf5e86;hb=f5384e02bc928851ebdecfd36e58e0996e1b5d6c;hp=202f0e65d13fcd25a70939d0aae99872c7aa6f49;hpb=2d486f53c3e3acb881ddca8e3625f4dee7bc81f7;p=unfold.git

diff --git a/Makefile b/Makefile
index 202f0e65..f1f19bbb 100644
--- a/Makefile
+++ b/Makefile
@@ -40,16 +40,16 @@ thirdparty-js:
 thirdparty-css:
 	@find $(THIRD-PARTY-RESOURCES) -name '*.css'
 thirdparty-img:
-	@find $(THIRD-PARTY-RESOURCES) -name '*.png'
+	@find $(THIRD-PARTY-RESOURCES) -name '*.png' -o -name '*.ico'
 
-# we might have any of these as templates - e.g. ./engine/templates/plugin-setenv.js
+# we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file
 local-js: force
 	@find . -type f -name '*.js' | egrep -v '/all-(static|templates)/|/third-party/|/templates/'
 local-css: force
 	@find . -type f -name '*.css' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 local-img: force
-	@find . -type f -name '*.png' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
+	@find . -type f -name '*.png' -o -name '*.ico' | egrep -v 'all-(static|templates)/|/third-party/|/templates/'
 
 list-js: thirdparty-js local-js
 list-css: thirdparty-css local-css
@@ -91,7 +91,7 @@ list-all list-resources: list-templates list-js list-css list-img
 #################### compute emacs tags
 # list files under git but exclude third-party stuff like bootstrap and jquery
 myfiles: force
-	@git ls-files | egrep -v 'insert(_|-)above|/third-party/|/play/'
+	@git ls-files | egrep -v 'insert(_|-)above|third-party/|play/'
 
 # in general it's right to rely on the contents as reported by git
 tags: force
@@ -108,7 +108,7 @@ SSHCOMMAND:=ssh root@$(MYSLICEBOX)
 ### rsync options
 # the config file should probably not be overridden ??
 # --exclude settings.py 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3' 
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude config.py --exclude all-static --exclude all-templates --exclude '*.sqlite3'  --exclude play/ 
 # usual excludes
 RSYNC_EXCLUDES		:= --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) 
 # make -n will propagate as rsync -n