Fixed makefile to the new format(no disscussion)