Improved makefile to use CXX variable instead of selecting compiler
using command-line variable.