Makefile need love too - and more after this

This is a wall make file fix up that starts the process for a real build system.  I need to do a lot more in this area.