Clean up makefile and builds

The makefile is still to explicit. I could glob on a lot of this stuff now.