Makefile modification for C++ compilation