add jquery-ui.css in the mix for nicer hazelnut rendering - although not perfect yet

[unfold.git] / Makefile

diff --git a/Makefile b/Makefile
index 85b5d09..3bbba8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ THIRD-PARTY-RESOURCES += $(shell ls third-party/bootstrap/*/*)
 THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.js)
 # likewise
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery.js)
+THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/css/jquery-ui.css)
 # spin comes in plain or min, + the jquery plugin, and our own settings
 THIRD-PARTY-RESOURCES += $(shell ls third-party/spin/*.js)
 
@@ -40,16 +41,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. ./unfold/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 +109,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