update makefile
Merge branch 'master' of github.com:chenlonggang/CSA-14-3-20