Makefile now has proper build dependencies