Simplify Makefiles