Minor speed optimization in Makefile generator
Workspace files updated