Fix Makefile to work smartly
IDNIT issue