Really tidy up MAKEFILE this time.