Update makefile
merge