Definitive3 changes in makefile