Some makefile fixes

Author: regebro

Changelog

@@ -4,6 +4,13 @@ A library for working with graphs in Python
 
 CHANGELOG
 
+Unreleased:
+
+Enhancements:
+	New location, and new main maintainers.
+	Various fixes and improvements to the Makefile and testrunning.
+	Automatic tests and coverage of master and pull request with Travis and Coveralls.
+
 
 Release 1.8.2 [July 14, 2012]
 

Makefile

@@ -10,6 +10,8 @@ TESTS_DIR="tests/"
 DOCS_DIR="docs/"
 TEMP="temp/"
 PYTHONPATH="`pwd`/core:`pwd`/dot"
+PYTHON="python"
+PYTHON3="python3"
 
 
 # General ------------------------------------------------------------
@@ -67,28 +69,28 @@ test-pre:
 	reset
 
 test: test-pre
-	PYTHONPATH=${PYTHONPATH} python tests/testrunner.py
+	PYTHONPATH=${PYTHONPATH} ${PYTHON} tests/testrunner.py
 
 test3: test-pre
-	PYTHONPATH=${PYTHONPATH} python3 tests/testrunner.py
+	PYTHONPATH=${PYTHONPATH} ${PYTHON3} tests/testrunner.py
 
 tests: test
 
 
 # Tests --------------------------------------------------------------
 
 console:
-	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python
+	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && ${PYTHON}
 
 console3:
-	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python3
+	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && ${PYTHON3}
 
 
 # Cleaning -----------------------------------------------------------
 
 cleanpyc:
-	find . -name *.pyc -exec rm {} \;
-	find . -name __pycache__ -exec rm -rf {} \;
+	find tests dot core -name *.pyc -exec rm {} \;
+	find tests dot core -name __pycache__ -exec rm -rf {} \; -prune
 
 clean: cleanpyc
 	rm -rf ${DOCS_DIR}

README

@@ -125,6 +125,9 @@ Jonathan Sternberg <jonathansternberg@gmail.com>
 Daniel Merritt <dmerritt@gmail.com>
 	* Fixed reading of XML-stored graphs with edge attributes.
 
+Sandro Tosi <morph@debian.org>
+	* Some improvements to Makefile
+
 
 LICENSE