Finished Makefile updates for serv. On to client next