makefile dependencies improved
fixed merge