Tweak some makefiles to prepare for bmake