Updated Makefile for clang++/g++