Some cleanup in the makefiles

No match.