Automatically use converted scripts in the makefile

1 files changed, 15 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 4c0cdef8..2672aad4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,22 @@
-PYTHON ?= python3
+PYTHON ?= python
 
 export PYTHONPATH = $(shell echo "$$PYTHONPATH"):./sphinx
 
 .PHONY: all check clean clean-pyc clean-patchfiles clean-generated pylint reindent test
 
+DONT_CHECK = -i build -i dist -i sphinx/style/jquery.js -i sphinx/pycode/pgen2 \
+             -i sphinx/util/smartypants.py -i .ropeproject -i doc/_build -i tests/path.py \
+             -i tests/coverage.py -i env -i utils/convert.py -i utils/reindent3.py \
+             -i utils/check_sources3.py
+
 all: clean-pyc check test
 
 check: convert-utils
-	@$(PYTHON) utils/check_sources.py -i build -i dist -i sphinx/style/jquery.js \
-		-i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py -i .ropeproject \
-		-i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py \
-		-i env -i .tox .
+ifeq ($(PYTHON), python3)
+	@$(PYTHON) utils/check_sources3.py $(DONT_CHECK) .
+else
+	@$(PYTHON) utils/check_sources.py $(DONT_CHECK) .
+endif
 
 clean: clean-pyc clean-patchfiles clean-backupfiles clean-generated
 
@@ -33,7 +39,11 @@ pylint:
 	@pylint --rcfile utils/pylintrc sphinx
 
 reindent: convert-utils
+ifeq ($(PYTHON), python3)
+	@$(PYTHON) utils/reindent3.py -r -B .
+else
 	@$(PYTHON) utils/reindent.py -r -B .
+endif
 
 test: build
 	@cd tests; $(PYTHON) run.py -d -m '^[tT]est' $(TEST)