Merge branch 'master' into multiuser-viewmultiuser-view

Conflicts:
	src/controllers/Users.class.php

1 files changed, 9 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 4b6eae6..a8184d0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,12 @@ all: style.css screen.css print.css
 %.css: %.scss
 	$(SASS) $< $@
 
+# These are for developers
+dev-grep-require.txt: src
+	echo '$@' > '$@'
+	grep -r 'require_once' '$<'|sed "s/^\([^:]*\):.*require_once('\([A-Za-z]*\)\.class\.php').*/\1:\t\2/"|grep -Ev '(require_once|Singleton)'|sort -u >> '$@'
+dev-grep-singleton.txt: src
+	echo '$@' > '$@'
+	grep -r '::getInstance' '$<'|sed 's/^\([^:]*\):.*[^A-Za-z]\([A-Za-z]*\)::getInstance(.*/\1:\t\2/'|sort -u >> '$@'
+dev-lint.txt: src
+	-find '$<' -name '*.php' -exec '$(PHP)' -l '{}' \; |grep -v '^No syntax errors detected in' > '$@'