update Makefile on branch integrate