Update makefile to reflect recent changes