添加dev/makefile
Merge branch 'develop_doubandev2'