update build system
reslove mak/mak.main conflict