Also rearrange make targets to prevent similar issues of happening again. The new targets dependency graph looks like this: