Improve Makefile dependencies