Rationalize makefile/gsl and update generated code for server changes.