Makefile: added make info + some improvements

1 files changed, 22 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 8d628c33..a790fb41 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,25 @@ NAME = ranger
 PYTHON = python
 DOCDIR = doc/pydoc
 CWD = $(shell pwd)
-
-.PHONY: all clean doc cleandoc edit push test commit install
-
-all: clean test
+EDITOR = vim
+
+.PHONY: all clean doc cleandoc edit push test commit install info snapshot
+
+info:
+	@echo 'This makefile provides shortcuts for common tasks.'
+	@echo 'make clean: Remove all unnecessary files (.pyc, .pyo)'
+	@echo 'make cleandoc: Remove the pydoc documentation'
+	@echo 'make doc: Create the pydoc documentation'
+	@echo 'make install: Install ranger'
+	@echo 'make snapshot: Create a tar.gz of the current git revision'
+	@echo
+	@echo 'For developers:'
+	@echo 'make commit: Test and commit the changes'
+	@echo 'make test: Run all unittests.'
+	@echo 'make push: push the changes via git'
+	@echo 'make edit: open all relevant files in your editor'
+
+all: test
 
 doc: cleandoc
 	mkdir -p $(DOCDIR)
@@ -23,11 +38,11 @@ cleandoc:
 clean:
 	find . -regex .\*.py[co]$ | xargs rm
 
-test:
+test: clean
 	./all_tests.py
 
 edit:
-	@vi ranger.py $(shell find ranger test -regex .\*py$ )
+	@$(EDITOR) ranger.py Makefile README COPYING HACKING INSTALL $(shell find ranger test -regex .\*py$ )
 
 push:
 	@for repo in $(shell git remote); do \
@@ -36,7 +51,7 @@ push:
 		git push $$repo -f hut; \
 	done
 
-commit:
+commit: test
 	@git citool
 
 snapshot: