Moving to makefile.common framework