Upated to new leaner makefile.