Did a few more tweaks to the Makefile to make it more generic.