Update Makefile to work with newer versions of g++