Merge branch 'fusionax' into account

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index d982bca..a6c1935 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: build
 build: core conf banana wiki openid medals jquery
 
 check:
-       @find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected'
+       @!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
 
 q:
        @echo -e "Code statistics\n"
@@ -46,7 +46,7 @@ q:
 ##
 
 core:
-       [ -d core ] || ( git submodule init && git submodule update )
+       [ -d core/.git ] || ( git submodule init && git submodule update )
        make -C core all
 
 ##
@@ -167,16 +167,15 @@ JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQ
 JQUERY_UI=core tabs
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/ui.,$(addsuffix .js,$(JQUERY_UI)))
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
+# TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue
+# is that the version we use is not available anymore on the Internet, and the latest version
+# we could use is not backward compatible with our current code.
+jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
 
 htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
        @$(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)