Merge branch 'xorg/maint' into xorg/master

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 90a3713..84edd6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile
 ##
 ## static content
 ##
-static: htdocs/javascript/core.js htdocs/javascript@VERSION
+static: htdocs/javascript/core.js htdocs/javascript@VERSION htdocs/javascript/json2.js
 
 htdocs/javascript/core.js:
        cd htdocs/javascript/ && ln -s ../../core/htdocs/javascript/core.js
@@ -84,6 +84,10 @@ htdocs/javascript/core.js:
 %@VERSION: % Makefile ChangeLog
        cd $< && rm -f $(VERSION) && ln -sf . $(VERSION)
 
+htdocs/javascript/json2.js: DOWNLOAD_SRC = https://github.com/douglascrockford/JSON-js/raw/master/json2.js --no-check-certificate
+htdocs/javascript/json2.js:
+       @$(download)
+
 ##
 ## wiki
 ##
@@ -135,25 +139,8 @@ get-wiki:
 ## openid
 ##
 
-openid: get-openid spool/openid/store
-
-# There is no obvious way to automatically use the latest version
-OPENID_VERSION = 2.2.2
-OPENID_COMMIT  = 782224d
-get-openid:
-       @if ! test -d include/Auth; then                                  \
-               wget --no-check-certificate                                   \
-                       https://github.com/openid/php-openid/tarball/$(OPENID_VERSION) \
-                       -O php-openid-$(OPENID_VERSION).tar.gz; \
-               tar -xzf php-openid-$(OPENID_VERSION).tar.gz;                \
-               mv openid-php-openid-$(OPENID_COMMIT)/Auth include/;                \
-               rm php-openid-$(OPENID_VERSION).tar.gz;                      \
-               rm -r openid-php-openid-$(OPENID_COMMIT);                           \
-       fi
-
-spool/openid/store:
-       mkdir -p $@
-       chmod o+w $@
+openid:
+       -rm -rf include/Auth
 
 ##
 ## banana