Update Makefile accordingly