Merge commit 'origin/fusionax' into account

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 958a9b1..45e715a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: build
 build: core conf banana wiki openid medals jquery
 
 check:
-       @find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected'
+       @!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
 
 q:
        @echo -e "Code statistics\n"
@@ -164,7 +164,10 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 JQUERY_PLUGINS=color
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES)
+JQUERY_UI=core tabs
+JQUERY_UI_PATHES=$(addprefix htdocs/javascript/ui.,$(addsuffix .js,$(JQUERY_UI)))
+
+jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
 
 htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
@@ -178,6 +181,10 @@ $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).t
 $(JQUERY_PLUGINS_PATHES):
        @$(download)
 
+$(JQUERY_UI_PATHES): DOWNLOAD_SRC = http://ui.jquery.com/latest/ui/$(@F)
+$(JQUERY_UI_PATHES):
+       @$(download)
+
 ################################################################################
 
 .PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check