Merge "Makefile: place defaults values and macro defs in a separate folder"