Rewrite of Makefile to be more user friendly