[configure.ac] add makefile for defaults
Merge branch 'master' into beta
[makefile] remove subdir
Merge branch 'master' into beta