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

diff --git a/Makefile b/Makefile
index bbc1afb..6b18c74 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,17 @@ PKG_DIRS = configs htdocs include install.d plugins po scripts templates upgrade
 
 VCS_FILTER = ! -name .arch-ids ! -name CVS
 
+define download
+@echo "Downloading $@ from $(DOWNLOAD_SRC)"
+wget $(DOWNLOAD_SRC) -O $@ -q || ($(RM) $@; exit 1)
+endef
+
 ################################################################################
 # global targets
 
 all: build
 
-build: core banana wiki jquery
+build: core conf banana wiki medals jquery
 
 q:
 	@echo -e "Code statistics\n"
@@ -37,16 +42,20 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
+core:
+	[ -d core ] || ( git submodule init && git submodule update )
+	make -C core all
+
+##
+## conf
+##
 
-spool/templates_c spool/mails_c spool/uploads spool/conf spool/uploads/temp:
+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 $@
 	chmod o+w $@
 
-spool/uploads/temp/.htaccess: spool/uploads/temp Makefile
-	echo "Order deny,allow" > $@
-	echo "Deny from all" >> $@
-
 htdocs/.htaccess: htdocs/.htaccess.in Makefile
 	@REWRITE_BASE="/~$$(id -un)"; \
 	test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
@@ -68,7 +77,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads/temp/.htaccess
+htdocs/uploads:
 	cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -113,17 +122,39 @@ 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
 ##
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
+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)
+
+htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
-	wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
+	@$(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
+.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http*