Updated makefile to reflect the latest changes