Simplified makefiles because bugs