Corrected makefile for reflect the correct behaivors from master branch