Redo the Makefile to be more build-on-change