Updating to simplified makefile