Makefile now has proper cross-component dependencies