Update deps, add new sub-deps to makefile.