Changed Makefile to be more concise.