Improve some makefiles