Enhancing Makefiles for better coreconfig logic