add former tophat-core.js as manifold-core.js -- remove extra spin

[unfold.git] / Makefile

diff --git a/Makefile b/Makefile
index c5c98a3..f1f19bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ 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. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file
@@ -49,7 +49,7 @@ local-js: force
 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