Fix makefile dependencies after elly's changes