Finished fixing Makefiles for serv and client