makefile updates #6.1