Remove need for MAKECMDGOALS and recursive make.
Misc Makefile cleanup.