new makefile option and changes.