Finishes transition to project-level Makefile

I integrated the changes from client/Makefile into the project-level
Makefile, so now the project-level Makefile builds everything (properly)