fixing makefile and dependencies