Merge commit 'origin/master' into fusionax

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 89a4ba3..fc1550e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 
 all: build
 
-build: core banana wiki jquery
+build: core conf banana wiki openid medals jquery
 
 q:
        @echo -e "Code statistics\n"
@@ -42,7 +42,15 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
+core:
+       [ -d core ] || ( git submodule init && git submodule update )
+       make -C core all
+
+##
+## conf
+##
+
+conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp 
 
 spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
        mkdir -p $@
@@ -95,12 +103,33 @@ wiki/pub/skins/empty:
 get-wiki:
        @if ! test -d wiki; then                                          \
            wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
-           tar -xzvf pmwiki-latest.tgz;                                  \
-           rm pmwiki-latest.tgz;                                         \
-           mv pmwiki-* wiki;                                             \
+           tar -xzvf pmwiki-latest.tgz;                                  \
+           rm pmwiki-latest.tgz;                                         \
+           mv pmwiki-* wiki;                                             \
        fi
 
 ##
+## openid
+##
+
+openid: get-openid spool/openid/store
+
+# There is no obvious way to automatically use the latest version
+get-openid:
+       @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/;                            \
+           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
 ##
 
@@ -114,7 +143,16 @@ htdocs/css/banana.css:
 include/banana/banana.inc.php:
        cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
 
+##
+## Medal thumbnails
+##
+MEDAL_PICTURES=$(wildcard htdocs/images/medals/*.jpg)
+MEDAL_THUMBNAILS=$(subst /medals/,/medals/thumb/,$(MEDAL_PICTURES))
+
+medals: $(MEDAL_THUMBNAILS)
 
+$(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
+       convert -resize x50 $(subst /medals/thumb/,/medals/,$@) $@
 
 ##
 ## jquery
@@ -123,17 +161,21 @@ include/banana/banana.inc.php:
 JQUERY_PLUGINS=color
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES)
+jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES)
 
-htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.pack.js
+htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
        @$(download)
 
+htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js
+htdocs/javascript/jquery.autocomplete.js:
+       @$(download)
+
 $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
 $(JQUERY_PLUGINS_PATHES):
        @$(download)
 
 ################################################################################
 
-.PHONY: build dist clean 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*