Update Makefile to build the core

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

diff --git a/Makefile b/Makefile
index f2ca45e..6b18c74 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 
 all: build
 
-build: core banana wiki medals jquery
+build: core conf banana wiki medals jquery
 
 q:
        @echo -e "Code statistics\n"
@@ -42,7 +42,15 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c classes/platalglobals.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 $@
@@ -148,5 +156,5 @@ $(JQUERY_PLUGINS_PATHES):
 
 ################################################################################
 
-.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*
 

diff --git a/core b/core
index ac2f544..3716d92 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ac2f544d3ee0cfe67fc61759f0f6f72dec7e1cc9
+Subproject commit 3716d925e42ab021bc3d8b996fd91e4f1ed689e8