revised p6/src/generate.c and p6/makefile