canceling part of reorganization
merging makefile and makefile.native