Update makefile format to match goma