Improve Makefile

use CXX instead of CPP since CPP generally means C pre-processor
use c++11 instead of c++0x since c++11 is already support in g++