makefile +updated server and client