Simplify makefiles