Update master makefile