Improve our Makefile to be more robust.