Update Makefile (CommonMakefiles)