Merge commit 'origin/fusionax' into account

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index c2fb537..45e715a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ all: build
 
 build: core conf banana wiki openid medals jquery
 
+check:
+       @!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
+
 q:
        @echo -e "Code statistics\n"
        @sloccount $(filter-out wiki/ spool/, $(wildcard */)) 2> /dev/null | egrep '^[a-z]*:'
@@ -112,18 +115,23 @@ get-wiki:
 ## openid
 ##
 
-openid: get-openid
+openid: get-openid spool/openid/store
 
 # There is no obvious way to automatically use the latest version
 get-openid:
-       @if ! test -d include/openid; then                                \
+       @if ! test -d include/Auth; then                                  \
            wget http://openidenabled.com/files/php-openid/packages/php-openid-2.1.2.tar.bz2; \
            tar -xjf php-openid-2.1.2.tar.bz2;                            \
-           mv php-openid-2.1.2/Auth include/openid;                      \
+           mv php-openid-2.1.2/Auth include/;                            \
            rm php-openid-2.1.2.tar.bz2;                                  \
            rm -r php-openid-2.1.2;                                       \
        fi
 
+spool/openid/store:
+       mkdir -p $@
+       chmod o+w $@
+
+
 ##
 ## banana
 ##
@@ -156,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:
@@ -170,7 +181,11 @@ $(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*
+.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check