Update Makefile to simplify choice between C++ and python.