Updated Makefile to better declare dependencies