Some small changes in source, but mainly modified Makefile and autotools to include also generator.