add make
Merge branch 'ubuntu-general'