X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=6b18c746929c6324a459a3c6a502a84556ff636d;hb=5d42c993d85a2f1fa3595eb1591a921c0f89d8cd;hp=0b6b37bbea8a314838fbc298ec47805c6cc4aab4;hpb=01ab5780ddaab6adf864c576205905ac37dfbe65;p=platal.git

diff --git a/Makefile b/Makefile
index 0b6b37b..6b18c74 100644
--- 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 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 $@
@@ -134,7 +142,7 @@ JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQ
 
 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)
 
@@ -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*