X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=30bf7ce9a5ffa99fd789bb16de9d353a7b5c6722;hb=HEAD;hp=b1fd7d79f3eb014608cbb4c24a018824ab4e4800;hpb=8e18c1a2ed60ece96e808944d97ea7d3cac92170;p=platal.git

diff --git a/Makefile b/Makefile
index b1fd7d7..30bf7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -251,20 +251,23 @@ $(JSTREE_PATH):
 ##
 maps: htdocs/javascript/markerclusterer.js
 
-## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/…).
+## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/...).
+## Force to use https to retrieve images
 htdocs/javascript/markerclusterer.js:
-	wget "http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308" -O htdocs/javascript/markerclusterer.js
+	wget 'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308' -O $@.tmp -q || ($(RM) $@.tmp; false)
+	sed 's,http\(://google-maps-utility-library-v3.googlecode.com\),https\1,g' < $@.tmp > $@
+	$(RM) $@.tmp
 
 ##
 ## Raven-js
 ##
 RAVEN_VERSION=1.1.2
-raven: htdocs/javascript/raven.min.js
+raven: $(addprefix htdocs/javascript/raven.,min.js min.map js)
 
 # Documentation: http://raven-js.readthedocs.org/en/latest/install/index.html
-htdocs/javascript/raven.min.js: DOWNLOAD_SRC = http://cdn.ravenjs.com/1.1.2/raven.min.js
-htdocs/javascript/raven.min.js:
-	@-rm htdocs/javascript/raven*.js:
+htdocs/javascript/raven.%: DOWNLOAD_SRC = http://cdn.ravenjs.com/$(RAVEN_VERSION)/$(@F)
+htdocs/javascript/raven.%:
+	@-rm $@
 	$(download)
 
 
@@ -287,8 +290,10 @@ restart-listrpc: stop-listrpc start-listrpc
 
 ################################################################################
 
-.PHONY: build dist clean core http* check test
-.PHONY: wiki build-wiki
+.PHONY: all build dist clean core http* q check test
+.PHONY: wiki build-wiki get-wiki
+.PHONY: openid
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
+.PHONY: medals jquery maps raven
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
 .PHONY: up update doc