Makefile improvements (dependencies)