Makefile changes to support clang