alter Makefile
fix merge
alter Makefile
add makefile, add configure file