unify makefiles
fix makefile