Revert "Split Makefile into two parts to avoid building sub targets in parlallel"

This reverts commit a8d861cb808822056926cc9a2c81a898a45d8d49.