update make rules for fire->sfire
remove duplicate make rule
reverting all sfire code