X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=f1f19bbb407c006e9059e79279a2e951e4cf5e86;hb=ad6ebdd21b0be23a246af3817c886637491ee23f;hp=a819950be9e7b73c8c67acf59e5e58dbd2b063b6;hpb=acfa8655c44198dd889117da22e3b456200415d1;p=unfold.git

diff --git a/Makefile b/Makefile
index a819950b..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
@@ -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