Restructure make targets to allow parallel make.