Updated top level Makefile