update makefiles for easier reading/editing