Fetch banana as a submodule: no external checkout required anymore.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/.gitmodules b/.gitmodules
index 7c16f52..addee92 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "core"]
        path = core
        url = ./
+[submodule "banana"]
+       path = banana
+       url = git://git.polytechnique.org/banana.git

diff --git a/Makefile b/Makefile
index aecab8c..4e808b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
 
 VERSNUM := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/ .*//")
 VERSTAG := $(shell grep VERSION ChangeLog | head -1 | grep 'XX' > /dev/null 2> /dev/null && echo 'beta')
-BANANA  := $(shell ( [ -d ../banana ] && echo `pwd`"/../banana" ) || echo "/home/web/dev/banana")
 
 VERSION = $(VERSNUM)$(VERSTAG)
 
@@ -148,14 +147,17 @@ spool/openid/store:
 ##
 
 banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
-htdocs/images/banana:
-       cd $(@D) && ln -snf $(BANANA)/img $(@F)
+htdocs/images/banana: banana-sub
+       cd $(@D) && ln -snf banana/banana/img $(@F)
 
-htdocs/css/banana.css:
-       cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
+htdocs/css/banana.css: banana-sub
+       cd $(@D) && ln -snf banana/css/style.css $(@F)
 
-include/banana/banana.inc.php:
-       cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
+include/banana/banana.inc.php: banana-sub
+       cd $(@D) && find ../../banana/banana/ -name '*.php' -exec ln -snf {} . ";"
+
+banana-sub:
+       make -C banana
 
 ##
 ## Medal thumbnails
@@ -206,5 +208,5 @@ $(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.
 
 ################################################################################
 
-.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check test
+.PHONY: build dist clean core wiki build-wiki banana banana-sub htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check test
 

diff --git a/banana b/banana
new file mode 160000 (submodule)
index 0000000..6ec8703
--- /dev/null
+++ b/banana
@@ -0,0 +1 @@
+Subproject commit 6ec8703c9a26dc36334478488789433b00c471d7